Changeset 25472 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 17, 2009 9:48:33 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56138

Message:

FreeBSD: Use sysctl instead of procfs to retrieve executable path and arguments. Contributed by Bernhard Froehlich and Baptiste Daroussin

Location:

trunk/src/VBox/Runtime

Files:

• VBox/log-vbox.cpp (modified) (4 diffs)
• r3/freebsd/rtProcInitExePath-freebsd.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/VBox/log-vbox.cpp

@@ -135 +135 @@
 #  include <Windows.h>
 # elif defined(RT_OS_LINUX)
+#  include <unistd.h>
+# elif defined(RT_OS_FREEBSD)
+#  include <sys/param.h>
+#  include <sys/sysctl.h>
+#  include <sys/user.h>
+#  include <stdlib.h>
 #  include <unistd.h>
 # elif defined(RT_OS_SOLARIS)
@@ -158 +164 @@
 # include <iprt/process.h>
 # include <iprt/string.h>
+# include <iprt/mem.h>
 # include <stdio.h>
 #endif
@@ -340 +347 @@
         }
 
-#  elif defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD)
-#   ifdef RT_OS_LINUX
+#  elif defined(RT_OS_LINUX)
         FILE *pFile = fopen("/proc/self/cmdline", "r");
-#   else /* RT_OS_FREEBSD: */
-        FILE *pFile = fopen("/proc/curproc/cmdline", "r");
-#   endif
         if (pFile)
         {
@@ -371 +374 @@
             fclose(pFile);
         }
-
+#  elif defined(RT_OS_FREEBSD)
+        char *pszArgFileBuf = NULL;
+        int aiName[4];
+        size_t cchArgs;
+
+        aiName[0] = CTL_KERN;
+        aiName[1] = KERN_PROC;
+        aiName[2] = KERN_PROC_ARGS;
+        aiName[3] = -1;
+
+        /* Retrieve the required length first */
+        cchArgs = 0;
+        int rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), NULL, &cchArgs, NULL, 0);
+
+        if (cchArgs > 0)
+        {
+            pszArgFileBuf = (char *)RTMemAllocZ(cchArgs + 1 /* Safety */);
+            if (pszArgFileBuf)
+            {
+                /* Retrieve the argument list */
+                rcBSD = sysctl(aiName, RT_ELEMENTS(aiName), NULL, &cchArgs, NULL, 0);
+                if (!rcBSD)
+                {
+                    /*
+                     * cmdline is a flattened argument list so we need
+                     * to convert all \0 to blanks
+                     */
+                    for(size_t i = 0; i < cchArgs - 1; i++)
+                    {
+                       if(pszArgFileBuf[i] == '\0')
+                          pszArgFileBuf[i] = ' ';
+                    }
+
+                    RTLogLoggerEx(pLogger, 0, ~0U, "Commandline: %s\n", pszArgFileBuf);
+                }
+                RTMemFree(pszArgFileBuf);
+            }
+        }
 #  elif defined(RT_OS_L4) || defined(RT_OS_OS2) || defined(RT_OS_DARWIN)
         /* commandline? */

trunk/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp

@@ -33 +33 @@
 *******************************************************************************/
 #define LOG_GROUP RTLOGGROUP_PROCESS
+#include <sys/param.h>
+#include <sys/sysctl.h>
 #include <unistd.h>
 #include <errno.h>
@@ -48 +50 @@
 DECLHIDDEN(int) rtProcInitExePath(char *pszPath, size_t cchPath)
 {
-    /*
-     * Read the /proc/curproc/file link, convert to native and return it.
-     */
-    int cchLink = readlink("/proc/curproc/file", pszPath, cchPath - 1);
-    if (cchLink > 0 && (size_t)cchLink <= cchPath - 1)
+    int aiName[4];
+    size_t cchExePath;
+
+    aiName[0] = CTL_KERN;
+    aiName[1] = KERN_PROC;
+    aiName[2] = KERN_PROC_PATHNAME;
+    aiName[3] = getpid();
+
+    cchExePath = cchPath - 1;
+    if(sysctl(aiName, RT_ELEMENTS(aiName), pszPath, &cchExePath, NULL, 0) == 0)
     {
-        pszPath[cchLink] = '\0';
-
         char *pszTmp = NULL;
         int rc = rtPathFromNative(&pszTmp, pszPath);
-        AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchLink, pszPath), rc);
+        AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhsx\n", rc, pszPath, cchExePath, pszPath), rc);
 
         size_t cch = strlen(pszTmp);
@@ -69 +74 @@
     }
 
-    int err = errno;
-
-    /*
-     * Fall back on the dynamic linker since /proc is optional.
-     */
-    void *hExe = dlopen(NULL, 0);
-    if (hExe)
-    {
-        struct link_map const *pLinkMap = 0;
-        if (dlinfo(hExe, RTLD_DI_LINKMAP, &pLinkMap) == 0)
-        {
-            const char *pszImageName = pLinkMap->l_name;
-            if (*pszImageName == '/') /* this may not always be absolute, despite the docs. :-( */
-            {
-                char *pszTmp = NULL;
-                int rc = rtPathFromNative(&pszTmp, pszImageName);
-                AssertMsgRCReturn(rc, ("rc=%Rrc pszImageName=\"%s\"\n", rc, pszImageName), rc);
-
-                size_t cch = strlen(pszTmp);
-                AssertReturn(cch <= cchPath, VERR_BUFFER_OVERFLOW);
-
-                memcpy(pszPath, pszTmp, cch + 1);
-                RTStrFree(pszTmp);
-
-                return VINF_SUCCESS;
-            }
-            /** @todo Try search the PATH for the file name or append the current
-             *        directory, which ever makes sense... */
-        }
-    }
-
-    int rc = RTErrConvertFromErrno(err);
-    AssertMsgFailed(("rc=%Rrc err=%d cchLink=%d hExe=%p\n", rc, err, cchLink, hExe));
+    int rc = RTErrConvertFromErrno(errno);
+    AssertMsgFailed(("rc=%Rrc errno=%d cchLink=%d\n", rc, errno, cchExePath));
     return rc;
 }