Changeset 63554 in vbox for trunk/src/VBox/Runtime/r3/netbsd/rtProcInitExePath-netbsd.cpp

Timestamp:

Aug 16, 2016 1:09:11 PM (8 years ago)

Author:

vboxsync

Message:

Runtime/NetBSD: re-import rtProcInitExePath-netbsd.cpp on top of an
svn copy of the FreeBSD version it's based on.

KERN_PROC_PATHNAME is only in NetBSD-current, so can't use it.

From Haomai Wang GSoC project with additional changes by Arto Huusko.

File:

• trunk/src/VBox/Runtime/r3/netbsd/rtProcInitExePath-netbsd.cpp (copied) (copied from trunk/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp ) (4 diffs)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - rtProcInitName, FreeBSD.
+ * IPRT - rtProcInitName, NetBSD.
  */
 
 /*
- * Copyright (C) 2006-2016 Oracle Corporation
+ * Copyright (C) 2006-2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -47 +47 @@
 DECLHIDDEN(int) rtProcInitExePath(char *pszPath, size_t cchPath)
 {
-#ifdef KERN_PROC_PATHNAME
-    int aiName[4];
-    aiName[0] = CTL_KERN;
-    aiName[1] = KERN_PROC;
-    aiName[2] = KERN_PROC_PATHNAME;     /* This was introduced in FreeBSD 6.0, thus the #ifdef above. */
-    aiName[3] = -1;                     /* Shorthand for the current process. */
-
-    size_t cchExePath = cchPath;
-    if (sysctl(aiName, RT_ELEMENTS(aiName), pszPath, &cchExePath, NULL, 0) == 0)
-    {
-        const char *pszTmp;
-        int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
-        AssertMsgRCReturn(rc, ("rc=%Rrc pszPath=\"%s\"\nhex: %.*Rhxs\n", rc, pszPath, cchExePath, pszPath), rc);
-        if (pszTmp != pszPath)
-        {
-            rc = RTStrCopy(pszPath, cchPath, pszTmp);
-            rtPathFreeIprt(pszTmp, pszPath);
-        }
-        return rc;
-    }
-
-    int rc = RTErrConvertFromErrno(errno);
-    AssertMsgFailed(("rc=%Rrc errno=%d cchExePath=%d\n", rc, errno, cchExePath));
-    return rc;
-
-#else
-
     /*
      * Read the /proc/curproc/file link, convert to native and return it.
      */
-    int cchLink = readlink("/proc/curproc/file", pszPath, cchPath - 1);
+    int cchLink = readlink("/proc/curproc/exe", pszPath, cchPath - 1);
     if (cchLink > 0 && (size_t)cchLink <= cchPath - 1)
     {
@@ -83 +56 @@
 
         char const *pszTmp;
-        int rc = rtPathFromNative(&pszTmp, pszPath);
+        int rc = rtPathFromNative(&pszTmp, pszPath, NULL);
         AssertMsgRCReturn(rc, ("rc=%Rrc pszLink=\"%s\"\nhex: %.*Rhxs\n", rc, pszPath, cchLink, pszPath), rc);
         if (pszTmp != pszPath)
         {
             rc = RTStrCopy(pszPath, cchPath, pszTmp);
-            rtPathFreeIprt(pszTmp);
+            rtPathFreeIprt(pszTmp, pszPath);
         }
         return rc;
@@ -125 +98 @@
     AssertMsgFailed(("rc=%Rrc err=%d cchLink=%d hExe=%p\n", rc, err, cchLink, hExe));
     return rc;
-#endif
 }
-