Changeset 3368 in vbox for trunk/src/libs

Timestamp:

Jul 3, 2007 12:23:27 AM (17 years ago)

Author:

vboxsync

Message:

NSPR/OS/2:

• Implemented correct import of named inherited file objects in child processes.
• Implemented real function of PR_CreateProcessDetached().
• Fixed: File handles and sockets are now non-inheritable by child processes by default.

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/md/_os2.h (modified) (1 diff)
• src/md/os2/os2io.c (modified) (9 diffs)
• src/md/os2/os2misc.c (modified) (9 diffs)
• src/md/os2/os2sock.c (modified) (1 diff)
• src/misc/prinit.c (modified) (2 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/md/_os2.h

@@ -432 +432 @@
 struct PRProcessAttr;
 
+extern struct PRProcess * _PR_CreateOS2ProcessEx(
+    const char *path,
+    char *const *argv,
+    char *const *envp,
+    const struct PRProcessAttr *attr,
+    PRBool detached
+);
+
 #define _MD_CREATE_PROCESS _PR_CreateOS2Process
 extern struct PRProcess * _PR_CreateOS2Process(

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2io.c

@@ -155 +155 @@
 
     if (osflags & PR_SYNC) access |= OPEN_FLAGS_WRITE_THROUGH;
+
+    /* we don't want to let children inherit file handles by default */
+    access |= OPEN_FLAGS_NOINHERIT;
 
     if (osflags & PR_RDONLY)
@@ -587 +590 @@
 _PR_MD_GETOPENFILEINFO(const PRFileDesc *fd, PRFileInfo *info)
 {
-   /* For once, the VAC compiler/library did a nice thing.
-    * The file handle used by the C runtime is the same one
-    * returned by the OS when you call DosOpen().  This means
-    * that you can take an OS HFILE and use it with C file
-    * functions.  The only caveat is that you have to call
-    * _setmode() first to initialize some junk.  This is
-    * immensely useful because I did not have a clue how to
-    * implement this function otherwise.  The windows folks
-    * took the source from the Microsoft C library source, but
-    * IBM wasn't kind enough to ship the source with VAC.
-    * On second thought, the needed function could probably
-    * be gotten from the OS/2 GNU library source, but the
-    * point is now moot.
-    */
-   struct stat hinfo;
+    /* For once, the VAC compiler/library did a nice thing.
+     * The file handle used by the C runtime is the same one
+     * returned by the OS when you call DosOpen().  This means
+     * that you can take an OS HFILE and use it with C file
+     * functions.  The only caveat is that you have to call
+     * _setmode() first to initialize some junk.  This is
+     * immensely useful because I did not have a clue how to
+     * implement this function otherwise.  The windows folks
+     * took the source from the Microsoft C library source, but
+     * IBM wasn't kind enough to ship the source with VAC.
+     * On second thought, the needed function could probably
+     * be gotten from the OS/2 GNU library source, but the
+     * point is now moot.
+     */
+    struct stat hinfo;
     PRInt64 s, s2us;
 
@@ -660 +663 @@
 _PR_MD_ACCESS(const char *name, PRAccessHow how)
 {
-  PRInt32 rv;
+    PRInt32 rv;
     switch (how) {
       case PR_ACCESS_WRITE_OK:
@@ -683 +686 @@
 _PR_MD_MKDIR(const char *name, PRIntn mode)
 {
-   PRInt32 rc;
+    PRInt32 rc;
     /* XXXMB - how to translate the "mode"??? */
     if ((rc = DosCreateDir((char *)name, NULL))== NO_ERROR) {
@@ -696 +699 @@
 _PR_MD_RMDIR(const char *name)
 {
-   PRInt32 rc;
+    PRInt32 rc;
     if ( (rc = DosDeleteDir((char *)name)) == NO_ERROR) {
         return 0;
@@ -709 +712 @@
 {
         PRInt32   rv;
-   FILELOCK lock, unlock;
-
-   lock.lOffset = 0;
-   lock.lRange = 0xffffffff;
-   unlock.lOffset = 0;
-   unlock.lRange = 0;
+    FILELOCK lock, unlock;
+
+    lock.lOffset = 0;
+    lock.lRange = 0xffffffff;
+    unlock.lOffset = 0;
+    unlock.lRange = 0;
 
         /*
@@ -746 +749 @@
 {
         PRInt32   rv;
-   FILELOCK lock, unlock;
-
-   lock.lOffset = 0;
-   lock.lRange = 0;
-   unlock.lOffset = 0;
-   unlock.lRange = 0xffffffff;
+    FILELOCK lock, unlock;
+
+    lock.lOffset = 0;
+    lock.lRange = 0;
+    unlock.lOffset = 0;
+    unlock.lRange = 0xffffffff;
     
-   rv = DosSetFileLocks( (HFILE) f,
+    rv = DosSetFileLocks( (HFILE) f,
                           &unlock, &lock,
                           0, 0); 
@@ -778 +781 @@
             rc = DosQueryFHState((HFILE)fd->secret->md.osfd, &flags);
             if (rc != NO_ERROR) {
-                PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
+                PR_SetError(PR_UNKNOWN_ERROR, rc);
                 return PR_FAILURE;
             }
@@ -791 +794 @@
             rc = DosSetFHState((HFILE)fd->secret->md.osfd, flags);
             if (rc != NO_ERROR) {
+                PR_SetError(PR_UNKNOWN_ERROR, rc);
+                return PR_FAILURE;
+            }
+            break;
+
+        case PR_DESC_LAYERED:
+            /* XXX what to do here? */
+            PR_SetError(PR_UNKNOWN_ERROR, 87 /*ERROR_INVALID_PARAMETER*/);
+            return PR_FAILURE;
+
+        case PR_DESC_SOCKET_TCP:
+        case PR_DESC_SOCKET_UDP:
+        {
+#ifdef XP_OS2_EMX
+            int rv = fcntl(fd->secret->md.osfd, F_SETFD, inheritable ? 0 : FD_CLOEXEC);
+            if (-1 == rv) {
                 PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
                 return PR_FAILURE;
             }
+#else
+            /* In VAC, socket() FDs are global. */
+#endif
             break;
+        }
+    }
+
+    return PR_SUCCESS;
+}
+
+void
+_PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported)
+{
+    if (imported) {
+        /* for imported handles, we'll determine the inheritance state later
+         * in _PR_MD_QUERY_FD_INHERITABLE */
+        fd->secret->inheritable = _PR_TRI_UNKNOWN;
+    } else {
+        switch (fd->methods->file_type)
+        {
+            case PR_DESC_PIPE:
+                /* On OS/2, pipe handles created by NPSR (PR_CreatePipe) are
+                 * inheritable by default */
+                fd->secret->inheritable = _PR_TRI_TRUE;
+                break;
+            case PR_DESC_FILE:
+                /* On OS/2, file handles created by NPSR (_MD_OPEN) are
+                 * made non-inheritable by default */
+                fd->secret->inheritable = _PR_TRI_FALSE;
+                break;
+
+            case PR_DESC_LAYERED:
+                /* XXX what to do here? */
+                break;
+
+            case PR_DESC_SOCKET_TCP:
+            case PR_DESC_SOCKET_UDP:
+#ifdef XP_OS2_EMX
+                /* In EMX/GCC, sockets opened by NSPR (_PR_MD_SOCKET) are
+                 * made non-inheritedable by default */
+                fd->secret->inheritable = _PR_TRI_FALSE;
+#else
+                /* In VAC, socket() FDs are global. */
+                fd->secret->inheritable = _PR_TRI_TRUE;
+#endif
+                break;
+        }
+    }
+}
+
+void
+_PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd)
+{
+    PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
+
+    switch (fd->methods->file_type)
+    {
+        case PR_DESC_PIPE:
+        case PR_DESC_FILE:
+        {
+            ULONG flags;
+            if (DosQueryFHState((HFILE)fd->secret->md.osfd, &flags) == 0) {
+                if (flags & OPEN_FLAGS_NOINHERIT) {
+                    fd->secret->inheritable = _PR_TRI_FALSE;
+                } else {
+                    fd->secret->inheritable = _PR_TRI_TRUE;
+                }
+            }
+            break;
+        }
 
         case PR_DESC_LAYERED:
-            /* what to do here? */
-            PR_SetError(PR_UNKNOWN_ERROR, 87 /*ERROR_INVALID_PARAMETER*/);
-            return PR_FAILURE;
+            /* XXX what to do here? */
+            break;
 
         case PR_DESC_SOCKET_TCP:
         case PR_DESC_SOCKET_UDP:
-            /* These are global on OS/2. */
+        {
+#ifdef XP_OS2_EMX
+            /* In EMX/GCC, socket() FDs are inherited by default. */
+            int flags = fcntl(fd->secret->md.osfd, F_GETFD, 0);
+            if (FD_CLOEXEC == flags) {
+                fd->secret->inheritable = _PR_TRI_FALSE;
+            } else {
+                fd->secret->inheritable = _PR_TRI_TRUE;
+            }
+#else
+            /* In VAC, socket() FDs are global. */
+#endif
             break;
-    }
-
-    return PR_SUCCESS;
-}
-
-void
-_PR_MD_INIT_FD_INHERITABLE(PRFileDesc *fd, PRBool imported)
-{
-    /* XXX this function needs to be implemented */
-    fd->secret->inheritable = _PR_TRI_UNKNOWN;
-}
-
-void
-_PR_MD_QUERY_FD_INHERITABLE(PRFileDesc *fd)
-{
-    /* XXX this function needs to be reviewed */
-    ULONG flags;
-
-    PR_ASSERT(_PR_TRI_UNKNOWN == fd->secret->inheritable);
-    if (DosQueryFHState((HFILE)fd->secret->md.osfd, &flags) == 0) {
-        if (flags & OPEN_FLAGS_NOINHERIT) {
-            fd->secret->inheritable = _PR_TRI_FALSE;
-        } else {
-            fd->secret->inheritable = _PR_TRI_TRUE;
         }
     }

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2misc.c

@@ -234 +234 @@
 }
 
-PRProcess * _PR_CreateOS2Process(
+/*
+ * On OS/2, you can only detach a new process -- you cannot make it detached
+ * after it has been started. This is why _PR_CreateOS2ProcessEx() is
+ * necessary. This function is called directly from PR_CreateProcessDetached().
+ */
+PRProcess * _PR_CreateOS2ProcessEx(
     const char *path,
     char *const *argv,
     char *const *envp,
-    const PRProcessAttr *attr)
+    const PRProcessAttr *attr,
+    PRBool detached)
 {
     PRProcess *proc = NULL;
@@ -245 +251 @@
     char *envBlock = NULL;
    
-    STARTDATA startData = {0};
     APIRET    rc;
     ULONG     ulAppType = 0;
@@ -255 +260 @@
     char      pszObjectBuffer[CCHMAXPATH];
     char     *pszFormatResult = NULL;
+    char     *pszArg0 = NULL;
 
     proc = PR_NEW(PRProcess);
@@ -266 +272 @@
         goto errorExit;
     }
-   
-    if (envp == NULL) {
-        newEnvp = NULL;
-    } else {
-        int i;
-        int numEnv = 0;
+
+    /* the 0th argument to the program (by convention, the program name, as
+     * entered by user) */
+    pszArg0 = argv[0];
+
+    /*
+     * If attr->fdInheritBuffer is not NULL, we need to insert
+     * it into the envp array, so envp cannot be NULL.
+     */
+    if ((envp == NULL) && attr && attr->fdInheritBuffer) {
+        envp = environ;
+    }
+
+    if (envp != NULL) {
+        int idx;
+        int numEnv;
+        int newEnvpSize;
+
+        numEnv = 0;
         while (envp[numEnv]) {
             numEnv++;
         }
-        newEnvp = (char **) PR_MALLOC((numEnv+1) * sizeof(char *));
-        for (i = 0; i <= numEnv; i++) {
-            newEnvp[i] = envp[i];
-        }
-        qsort((void *) newEnvp, (size_t) numEnv, sizeof(char *), compare);
+        newEnvpSize = numEnv + 1;  /* terminating null pointer */
+        if (attr && attr->fdInheritBuffer) {
+            newEnvpSize++;
+        }
+        newEnvp = (char **) PR_MALLOC(newEnvpSize * sizeof(char *));
+        for (idx = 0; idx < numEnv; idx++) {
+            newEnvp[idx] = envp[idx];
+        }
+        if (attr && attr->fdInheritBuffer) {
+            newEnvp[idx++] = attr->fdInheritBuffer;
+        }
+        newEnvp[idx] = NULL;
+        qsort((void *) newEnvp, (size_t) (newEnvpSize - 1),
+                sizeof(char *), compare);
     }
     if (assembleEnvBlock(newEnvp, &envBlock) == -1) {
@@ -285 +313 @@
         goto errorExit;
     }
-  
+
     if (attr) {
-       PR_ASSERT(!"Not implemented");
+        if (attr->stdinFd || attr->stdoutFd || attr->stderrFd)
+            PR_ASSERT(!"Stdin/stdout redirection is not implemented");
+        if (attr->currentDirectory)
+            PR_ASSERT(!"Setting current directory is not implemented");
     }
 
@@ -300 +331 @@
                 strcpy(pszFormatString, "/C %s %s");
                 strcpy(pszEXEName, pszComSpec);
+                pszArg0 = pszEXEName;
                 ulAppType = FAPPTYP_WINDOWCOMPAT;
              }
@@ -309 +341 @@
        goto errorExit;
     }
- 
-    if ((ulAppType & FAPPTYP_WINDOWAPI) == FAPPTYP_WINDOWAPI) {
-        startData.SessionType = SSF_TYPE_PM;
-    }
-    else if (ulAppType & FAPPTYP_WINDOWCOMPAT) {
-        startData.SessionType = SSF_TYPE_WINDOWABLEVIO;
+
+    if (detached) {
+        /* we don't care about parent/child process type matching,
+         * DosExecPgm() should complain if there is a mismatch. */
+
+        size_t cbArg0 = strlen(pszArg0);
+        char *pszArgs = NULL;
+
+        if (pszEXEName[0]) {
+            pszFormatResult = PR_MALLOC(cbArg0 + 1 +
+                                        strlen(pszFormatString) +
+                                        strlen(path) + strlen(cmdLine) + 1 + 1);
+            if (!pszFormatResult) {
+                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+                goto errorExit;
+            }
+            pszArgs = pszFormatResult + cbArg0 + 1;
+            sprintf(pszArgs, pszFormatString, path, cmdLine);
+        } else {
+            strcpy(pszEXEName, path);
+            pszFormatResult = PR_MALLOC(cbArg0 + 1 +
+                                        strlen(cmdLine) + 1 + 1);
+            if (!pszFormatResult) {
+                PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
+                goto errorExit;
+            }
+            pszArgs = pszFormatResult + cbArg0 + 1;
+            strcpy(pszArgs, cmdLine);
+        }
+
+        strcpy(pszFormatResult, pszArg0);
+        /* add final NULL */
+        pszArgs[strlen(pszArgs) + 1] = '\0';
+
+        RESULTCODES res = {0};
+        rc = DosExecPgm(pszObjectBuffer, CCHMAXPATH, EXEC_BACKGROUND,
+                        pszFormatResult, envBlock, &res, pszEXEName);
+
+        if (rc != NO_ERROR) {
+            PR_SetError(PR_UNKNOWN_ERROR, rc);
+            goto errorExit;
+        }
+
+        proc->md.pid = res.codeTerminate;
     }
     else {
-        startData.SessionType = SSF_TYPE_DEFAULT;
-    }
- 
-    if (ulAppType & (FAPPTYP_WINDOWSPROT31 | FAPPTYP_WINDOWSPROT | FAPPTYP_WINDOWSREAL))
-    {
-        strcpy(pszEXEName, "WINOS2.COM");
-        startData.SessionType = PROG_31_STDSEAMLESSVDM;
-        strcpy(pszFormatString, "/3 %s %s");
-    }
- 
-    startData.InheritOpt = SSF_INHERTOPT_SHELL;
- 
-    if (pszEXEName[0]) {
-        pszFormatResult = PR_MALLOC(strlen(pszFormatString)+strlen(path)+strlen(cmdLine));
-        sprintf(pszFormatResult, pszFormatString, path, cmdLine);
-        startData.PgmInputs = pszFormatResult;
-    } else {
-        strcpy(pszEXEName, path);
-        startData.PgmInputs = cmdLine;
-    }
-    startData.PgmName = pszEXEName;
- 
-    startData.Length = sizeof(startData);
-    startData.Related = SSF_RELATED_INDEPENDENT;
-    startData.ObjectBuffer = pszObjectBuffer;
-    startData.ObjectBuffLen = CCHMAXPATH;
-    startData.Environment = envBlock;
- 
-    rc = DosStartSession(&startData, &ulAppType, &pid);
-
-    if ((rc != NO_ERROR) && (rc != ERROR_SMG_START_IN_BACKGROUND)) {
-        PR_SetError(PR_UNKNOWN_ERROR, 0);
-    }
- 
-    proc->md.pid = pid;
+        STARTDATA startData = {0};
+
+        if ((ulAppType & FAPPTYP_WINDOWAPI) == FAPPTYP_WINDOWAPI) {
+            startData.SessionType = SSF_TYPE_PM;
+        }
+        else if (ulAppType & FAPPTYP_WINDOWCOMPAT) {
+            startData.SessionType = SSF_TYPE_WINDOWABLEVIO;
+        }
+        else {
+            startData.SessionType = SSF_TYPE_DEFAULT;
+        }
+
+        if (ulAppType & (FAPPTYP_WINDOWSPROT31 | FAPPTYP_WINDOWSPROT | FAPPTYP_WINDOWSREAL))
+        {
+            strcpy(pszEXEName, "WINOS2.COM");
+            startData.SessionType = PROG_31_STDSEAMLESSVDM;
+            strcpy(pszFormatString, "/3 %s %s");
+        }
+
+        startData.InheritOpt = SSF_INHERTOPT_PARENT;
+
+        if (pszEXEName[0]) {
+            pszFormatResult = PR_MALLOC(strlen(pszFormatString)+strlen(path)+strlen(cmdLine));
+            sprintf(pszFormatResult, pszFormatString, path, cmdLine);
+            startData.PgmInputs = pszFormatResult;
+        } else {
+            strcpy(pszEXEName, path);
+            startData.PgmInputs = cmdLine;
+        }
+        startData.PgmName = pszEXEName;
+
+        startData.Length = sizeof(startData);
+        startData.Related = SSF_RELATED_INDEPENDENT;
+        startData.ObjectBuffer = pszObjectBuffer;
+        startData.ObjectBuffLen = CCHMAXPATH;
+        startData.Environment = envBlock;
+
+        rc = DosStartSession(&startData, &ulAppType, &pid);
+
+        if ((rc != NO_ERROR) && (rc != ERROR_SMG_START_IN_BACKGROUND)) {
+            PR_SetError(PR_UNKNOWN_ERROR, rc);
+            goto errorExit;
+        }
+
+        proc->md.pid = pid;
+    }
 
     if (pszFormatResult) {
         PR_DELETE(pszFormatResult);
     }
- 
-    PR_DELETE(cmdLine);
+    if (cmdLine) {
+        PR_DELETE(cmdLine);
+    }
     if (newEnvp) {
         PR_DELETE(newEnvp);
@@ -367 +449 @@
 
 errorExit:
+    if (pszFormatResult) {
+        PR_DELETE(pszFormatResult);
+    }
     if (cmdLine) {
         PR_DELETE(cmdLine);
@@ -380 +465 @@
     }
     return NULL;
-}  /* _PR_CreateOS2Process */
+}  /* _PR_CreateOS2ProcessEx */
+
+PRProcess * _PR_CreateOS2Process(
+    const char *path,
+    char *const *argv,
+    char *const *envp,
+    const PRProcessAttr *attr)
+{
+    return _PR_CreateOS2ProcessEx(path, argv, envp, attr, PR_FALSE);
+}
 
 PRStatus _PR_DetachOS2Process(PRProcess *process)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/os2/os2sock.c

@@ -88 +88 @@
         _PR_MD_MAP_SOCKET_ERROR(err);
     }
+
+#ifdef XP_OS2_EMX
+    /* Disable inheritance of socket FDs by default to avoid side effects */
+    err = fcntl(osfd, F_SETFD, FD_CLOEXEC);
+    if (-1 == err) {
+        PR_SetError(PR_UNKNOWN_ERROR, _MD_ERRNO());
+        soclose(osfd);
+        return -1;
+    }
+#endif
 
     return(osfd);

trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c

@@ -740 +740 @@
     const PRProcessAttr *attr)
 {
+#ifdef XP_OS2
+    PRProcess *process;
+    process = _PR_CreateOS2ProcessEx(path, argv, envp, attr, PR_TRUE);
+    if (NULL == process) {
+        return PR_FAILURE;
+    }
+    return PR_SUCCESS;
+#else
     PRProcess *process;
     PRStatus rv;
@@ -745 +753 @@
     process = PR_CreateProcess(path, argv, envp, attr);
     if (NULL == process) {
-        return PR_FAILURE;
+        return PR_FAILURE;
     }
     rv = PR_DetachProcess(process);
     PR_ASSERT(PR_SUCCESS == rv);
     if (rv == PR_FAILURE) {
-        PR_DELETE(process);
-        return PR_FAILURE;
+        PR_DELETE(process);
+        return PR_FAILURE;
     }
     return PR_SUCCESS;
+#endif
 }