Changeset 101839 in vbox for trunk/src/libs/xpcom18a4/nsprpub/pr

Timestamp:

Nov 5, 2023 5:11:43 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Cut down the PR_Process* API to the absolute minimum which is actually used, bugref:10545

Location:

trunk/src/libs/xpcom18a4/nsprpub/pr

Files:

• include/private/primpl.h (modified) (1 diff)
• include/prproces.h (modified) (4 diffs)
• src/md/unix/unix.c (modified) (1 diff)
• src/md/unix/uxproces.c (deleted)
• src/misc/prinit.c (modified) (4 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/include/private/primpl.h

@@ -623 +623 @@
 /* Process control */
 
-extern PRProcess * _PR_MD_CREATE_PROCESS(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-#define    _PR_MD_CREATE_PROCESS _MD_CREATE_PROCESS
-
 #ifdef _MD_CREATE_PROCESS_DETACHED
 # define _PR_MD_CREATE_PROCESS_DETACHED _MD_CREATE_PROCESS_DETACHED
 #endif
-
-extern PRStatus _PR_MD_DETACH_PROCESS(PRProcess *process);
-#define    _PR_MD_DETACH_PROCESS _MD_DETACH_PROCESS
-
-extern PRStatus _PR_MD_WAIT_PROCESS(PRProcess *process, PRInt32 *exitCode);
-#define    _PR_MD_WAIT_PROCESS _MD_WAIT_PROCESS
-
-extern PRStatus _PR_MD_KILL_PROCESS(PRProcess *process);
-#define    _PR_MD_KILL_PROCESS _MD_KILL_PROCESS
 
 /* Current Time */

trunk/src/libs/xpcom18a4/nsprpub/pr/include/prproces.h

@@ -49 +49 @@
 #define PR_ResetProcessAttr VBoxNsprPR_ResetProcessAttr
 #define PR_ProcessAttrSetStdioRedirect VBoxNsprPR_ProcessAttrSetStdioRedirect
-#define PR_SetStdioRedirect VBoxNsprPR_SetStdioRedirect
 #define PR_ProcessAttrSetCurrentDirectory VBoxNsprPR_ProcessAttrSetCurrentDirectory
-#define PR_CreateProcess VBoxNsprPR_CreateProcess
-#define PR_DetachProcess VBoxNsprPR_DetachProcess
-#define PR_WaitProcess VBoxNsprPR_WaitProcess
-#define PR_KillProcess VBoxNsprPR_KillProcess
 #endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 
@@ -78 +73 @@
 );
 
-/*
- * OBSOLETE -- use PR_ProcessAttrSetStdioRedirect instead.
- */
-NSPR_API(void) PR_SetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd
-);
-
 NSPR_API(PRStatus) PR_ProcessAttrSetCurrentDirectory(
     PRProcessAttr *attr,
@@ -98 +84 @@
 );
 
-/*
-** Create a new process
-**
-** Create a new process executing the file specified as 'path' and with
-** the supplied arguments and environment.
-**
-** This function may fail because of illegal access (permissions),
-** invalid arguments or insufficient resources.
-**
-** A process may be created such that the creator can later synchronize its
-** termination using PR_WaitProcess(). 
-*/
-
-NSPR_API(PRProcess*) PR_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr);
-
 NSPR_API(PRStatus) PR_CreateProcessDetached(
     const char *path,
@@ -123 +90 @@
     const PRProcessAttr *attr);
 
-NSPR_API(PRStatus) PR_DetachProcess(PRProcess *process);
-
-NSPR_API(PRStatus) PR_WaitProcess(PRProcess *process, PRInt32 *exitCode);
-
-NSPR_API(PRStatus) PR_KillProcess(PRProcess *process);
-
 PR_END_EXTERN_C
 

trunk/src/libs/xpcom18a4/nsprpub/pr/src/md/unix/unix.c

@@ -1139 +1139 @@
 }
 
-#if defined(LINUX)
-extern void _MD_unix_terminate_waitpid_daemon(void);
-
-void _MD_CleanupBeforeExit(void)
-{
-    _MD_unix_terminate_waitpid_daemon();
-}
-#endif
-
 #if defined(SOLARIS)
 PRIntervalTime _MD_Solaris_TicksPerSecond(void)

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

@@ -41 +41 @@
 #ifdef VBOX_USE_IPRT_IN_NSPR
 # include <iprt/initterm.h>
+#endif
+
+#ifdef VBOX
+#include <iprt/err.h>
+#include <iprt/env.h>
+#include <iprt/file.h>
+#include <iprt/process.h>
 #endif
 
@@ -287 +294 @@
             PR_ASSERT(0);
     }
-}
-
-/*
- * OBSOLETE
- */
-PR_IMPLEMENT(void)
-PR_SetStdioRedirect(
-    PRProcessAttr *attr,
-    PRSpecialFD stdioFd,
-    PRFileDesc *redirectFd)
-{
-#if defined(DEBUG)
-    static PRBool warn = PR_TRUE;
-    if (warn) {
-        warn = _PR_Obsolete("PR_SetStdioRedirect()",
-                "PR_ProcessAttrSetStdioRedirect()");
-    }
-#endif
-    PR_ProcessAttrSetStdioRedirect(attr, stdioFd, redirectFd);
 }
 
@@ -470 +458 @@
 }
 
-PR_IMPLEMENT(PRProcess*) PR_CreateProcess(
-    const char *path,
-    char *const *argv,
-    char *const *envp,
-    const PRProcessAttr *attr)
-{
-    return _PR_MD_CREATE_PROCESS(path, argv, envp, attr);
-}  /* PR_CreateProcess */
-
 PR_IMPLEMENT(PRStatus) PR_CreateProcessDetached(
     const char *path,
@@ -485 +464 @@
     const PRProcessAttr *attr)
 {
-#ifndef _PR_MD_CREATE_PROCESS_DETACHED
-    PRProcess *process;
-    PRStatus rv;
-s
-#ifdef XP_OS2
-    process = _PR_CreateOS2ProcessEx(path, argv, envp, attr, PR_TRUE);
-#else
-    process = PR_CreateProcess(path, argv, envp, attr);
-#endif
-    if (NULL == process) {
+    int vrc;
+    int nEnv, idx;
+    RTENV childEnv;
+    RTENV newEnv = RTENV_DEFAULT;
+
+    /* this code doesn't support all attributes */
+    PR_ASSERT(!attr || !attr->currentDirectory);
+    /* no custom environment, please */
+    PR_ASSERT(!envp);
+
+    childEnv = RTENV_DEFAULT;
+    if (attr && attr->fdInheritBuffer) {
+        vrc = RTEnvClone(&newEnv, childEnv);
+        if (RT_FAILURE(vrc))
+            return PR_FAILURE;
+        vrc = RTEnvPutEx(newEnv, attr->fdInheritBuffer);
+        if (RT_FAILURE(vrc))
+        {
+            RTEnvDestroy(newEnv);
+            return PR_FAILURE;
+        }
+        childEnv = newEnv;
+    }
+
+    PRTHANDLE pStdIn = NULL, pStdOut = NULL, pStdErr = NULL;
+    RTHANDLE hStdIn, hStdOut, hStdErr;
+    if (attr && attr->stdinFd)
+    {
+        hStdIn.enmType = RTHANDLETYPE_FILE;
+        RTFileFromNative(&hStdIn.u.hFile, attr->stdinFd->secret->md.osfd);
+        pStdIn = &hStdIn;
+    }
+    if (attr && attr->stdoutFd)
+    {
+        hStdOut.enmType = RTHANDLETYPE_FILE;
+        RTFileFromNative(&hStdOut.u.hFile, attr->stdoutFd->secret->md.osfd);
+        pStdOut = &hStdOut;
+    }
+    if (attr && attr->stderrFd)
+    {
+        hStdErr.enmType = RTHANDLETYPE_FILE;
+        RTFileFromNative(&hStdErr.u.hFile, attr->stderrFd->secret->md.osfd);
+        pStdErr = &hStdErr;
+    }
+
+    vrc = RTProcCreateEx(path, (const char **)argv, childEnv,
+                         RTPROC_FLAGS_DETACHED, pStdIn, pStdOut, pStdErr,
+                         NULL /* pszAsUser */, NULL /* pszPassword */, NULL /* pExtraData */,
+                         NULL /* phProcess */);
+    if (newEnv != RTENV_DEFAULT) {
+        RTEnvDestroy(newEnv);
+    }
+    if (RT_SUCCESS(vrc))
+        return PR_SUCCESS;
+    else
         return PR_FAILURE;
-    }
-    rv = PR_DetachProcess(process);
-    PR_ASSERT(PR_SUCCESS == rv);
-    if (rv == PR_FAILURE) {
-        PR_DELETE(process);
-        return PR_FAILURE;
-    }
-    return PR_SUCCESS;
-#else /* _PR_MD_CREATE_PROCESS_DETACHED */
-    return _PR_MD_CREATE_PROCESS_DETACHED(path, argv, envp, attr);
-#endif /* _PR_MD_CREATE_PROCESS_DETACHED */
-}
-
-PR_IMPLEMENT(PRStatus) PR_DetachProcess(PRProcess *process)
-{
-    return _PR_MD_DETACH_PROCESS(process);
-}
-
-PR_IMPLEMENT(PRStatus) PR_WaitProcess(PRProcess *process, PRInt32 *exitCode)
-{
-    return _PR_MD_WAIT_PROCESS(process, exitCode);
-}  /* PR_WaitProcess */
-
-PR_IMPLEMENT(PRStatus) PR_KillProcess(PRProcess *process)
-{
-    return _PR_MD_KILL_PROCESS(process);
 }