@@ -1,5 +1,7 @@

[userv.git] / servexec.c

diff --git a/servexec.c b/servexec.c
index 8c3494a6673705a76eae97c89ca9044251d437b6..aa35fc7550272dcc9286160673791a829909b64f 100644 (file)
--- a/servexec.c
+++ b/servexec.c
@@ -250,7 +250,16 @@ void execservice(const int synchsocket[], int clientfd) {
 
   if (close(clientfd)) serv_syscallfail("close client socket fd");
 
-  /* Now we have to make all the fd's work.  It's rather a complicated
+  /* First we need to close the holding writing ends of the pipes
+   * inherited from our parent: */
+  for (fd=0; fd<fdarrayused; fd++) {
+    if (fdarray[fd].holdfd == -1) continue;
+    if (close(fdarray[fd].holdfd)) serv_syscallfail("close pipe hold fd");
+    fdarray[fd].holdfd= -1;
+  }
+  /* Now we can reuse the .holdfd member of the fdarray entries. */
+
+  /* We have to make all the fd's work.  It's rather a complicated
    * algorithm, unfortunately.  We remember in holdfd[fd] whether fd
    * is being used to hold a file descriptor we actually want for some
    * other real fd in the service program; holdfd[fd] contains the fd
@@ -260,11 +269,6 @@ void execservice(const int synchsocket[], int clientfd) {
    * holdfd tells us we're currently storing some other fd in there we
    * move it out of the way with dup and record its new location.
    */
-  for (fd=0; fd<fdarrayused; fd++) {
-    if (fdarray[fd].holdfd == -1) continue;
-    if (close(fdarray[fd].holdfd)) serv_syscallfail("close pipe hold fd");
-    fdarray[fd].holdfd= -1;
-  }
   for (fd=0; fd<fdarrayused; fd++) {
     if (fdarray[fd].realfd < fdarrayused && fdarray[fd].realfd >= 0)
       fdarray[fdarray[fd].realfd].holdfd= fd;