Cygwin: FIFO: update clone and dup

Deal with all clients.

diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h
index af5f500bf25e44be0116296f7b5f7809581196f2..0ebc44e0ddf36dbb3e9212a85390f855131144c4 100644 (file)
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/fhandler.h
@@ -1309,9 +1309,11 @@ public:
   fhandler_fifo *clone (cygheap_types malloc_type = HEAP_FHANDLER)
   {
     void *ptr = (void *) ccalloc (malloc_type, 1, sizeof (fhandler_fifo));
-    fhandler_fifo *fh = new (ptr) fhandler_fifo (ptr);
-    copyto (fh);
-    return fh;
+    fhandler_fifo *fhf = new (ptr) fhandler_fifo (ptr);
+    copyto (fhf);
+    for (int i = 0; i < nclients; i++)
+      fhf->client[i].fh = client[i].fh->fhandler_base::clone ();
+    return fhf;
   }
 };
 

diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc
index 1dcb3b3df3ed4f1a953957ef9a4d1f0cb31950f9..c295c2393c784f6c8b7b4e1bcac8355caa62341a 100644 (file)
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler_fifo.cc
@@ -816,6 +816,31 @@ fhandler_fifo::dup (fhandler_base *child, int flags)
       __seterrno ();
       return -1;
     }
+  for (int i = 0; i < nclients; i++)
+    {
+      if (!DuplicateHandle (GetCurrentProcess (), client[i].fh->get_handle (),
+                           GetCurrentProcess (),
+                           &fhf->client[i].fh->get_handle (),
+                           0, true, DUPLICATE_SAME_ACCESS)
+         || !DuplicateHandle (GetCurrentProcess (), client[i].connect_evt,
+                              GetCurrentProcess (),
+                              &fhf->client[i].connect_evt,
+                              0, true, DUPLICATE_SAME_ACCESS)
+         || !DuplicateHandle (GetCurrentProcess (), client[i].dummy_evt,
+                              GetCurrentProcess (),
+                              &fhf->client[i].dummy_evt,
+                              0, true, DUPLICATE_SAME_ACCESS))
+       {
+         CloseHandle (fhf->read_ready);
+         CloseHandle (fhf->write_ready);
+         fhf->close ();
+         __seterrno ();
+         return -1;
+       }
+    }
+  fhf->listen_client_thr = NULL;
+  fhf->lct_termination_evt = NULL;
+  fhf->fifo_client_unlock ();
   return 0;
 }