Changeset 4161

Timestamp:

Jan 30, 2014 1:53:40 PM (10 years ago)

Author:

ldelgass

Message:

Fix bug in nanoscale where stderr would be closed if using stdout for socket
output.

File:

• trunk/packages/vizservers/nanoscale/server.c (modified) (2 diffs)

trunk/packages/vizservers/nanoscale/server.c

@@ -625 +625 @@
                     }
                 }
-                for (i = serverPtr->outputFd + 1; i <= FD_SETSIZE; i++) {
-                    close(i);           /* Close all the other descriptors. */
+                /* Close all the other descriptors. */
+                for (i = 3; i <= FD_SETSIZE; i++) {
+                    if (i != serverPtr->inputFd &&
+                        i != serverPtr->outputFd) {
+                        close(i);
+                    }
                 }
 
@@ -642 +646 @@
                                     (const char *const *)serverPtr->cmdArgs);
                     INFO("Executing %s: client=%s, \"%s\" in=%d out=%d on DISPLAY=%s",
-                     serverPtr->name, inet_ntoa(newaddr.sin_addr),
-                     cmd, serverPtr->inputFd, serverPtr->outputFd, display);
+                         serverPtr->name, inet_ntoa(newaddr.sin_addr),
+                         cmd, serverPtr->inputFd, serverPtr->outputFd, display);
                     /* Replace the current process with the render server. */
                     execvp(serverPtr->cmdArgs[0], serverPtr->cmdArgs);