Changeset 11836 in vbox

Timestamp:

Aug 29, 2008 4:52:20 PM (17 years ago)

Author:

vboxsync

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

35668

Message:

IPRT: Implemented RTR3Init*WithProgramPath. Added RTPathParse. Cleaned up the RTPathProgram and RTProcGetExecutableName implementations.

Location:

trunk

Files:

• include/iprt/path.h (modified) (1 diff)
• src/VBox/Runtime/Makefile.kmk (modified) (7 diffs)
• src/VBox/Runtime/include/internal/path.h (modified) (1 diff)
• src/VBox/Runtime/include/internal/process.h (modified) (3 diffs)
• src/VBox/Runtime/r3/init.cpp (modified) (7 diffs)
• src/VBox/Runtime/r3/path.cpp (modified) (5 diffs)
• src/VBox/Runtime/r3/posix/path-posix.cpp (modified) (3 diffs)
• src/VBox/Runtime/r3/posix/process-posix.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/process.cpp (modified) (2 diffs)
• src/VBox/Runtime/r3/win/path-win.cpp (modified) (1 diff)
• src/VBox/Runtime/r3/win/process-win.cpp (modified) (1 diff)
• src/VBox/Runtime/testcase/tstPath.cpp (modified) (4 diffs)

trunk/include/iprt/path.h

@@ -231 +231 @@
  */
 RTDECL(void) RTPathStripTrailingSlash(char *pszPath);
+
+/**
+ * Parses a path.
+ * 
+ * It figures the length of the directory component, the offset of 
+ * the file name and the location of the suffix dot.
+ *
+ * @returns The path length.
+ * 
+ * @param   pszPath     Path to find filename in.
+ * @param   pcbDir      Where to put the length of the directory component.
+ *                      If no directory, this will be 0. Optional.
+ * @param   poffName    Where to store the filename offset.
+ *                      If empty string or if it's ending with a slash this
+ *                      will be set to -1. Optional.
+ * @param   poffSuff    Where to store the suffix offset (the last dot).
+ *                      If empty string or if it's ending with a slash this
+ *                      will be set to -1. Optional.
+ * @param   pfFlags     Where to set flags returning more information about 
+ *                      the path. For the future. Optional.
+ */
+RTDECL(size_t) RTPathParse(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff);
 
 /**

trunk/src/VBox/Runtime/Makefile.kmk

@@ -310 +310 @@
         r3/win/process-win.cpp \
         r3/win/RTLogWriteDebugger-win.cpp \
+        r3/win/rtProcInitExePath-win.cpp \
         r3/win/sched-win.cpp \
         r3/win/sems-win.cpp \
@@ -338 +339 @@
         generic/uuid-generic.cpp \
         r3/linux/mp-linux.cpp \
+        r3/linux/rtProcInitExePath-linux.cpp \
         r3/linux/sched-linux.cpp \
         r3/linux/time-linux.cpp \
@@ -394 +396 @@
         r3/os2/filelock-os2.cpp \
         r3/os2/mp-os2.cpp \
+        r3/os2/rtProcInitExePath-os2.cpp \
         r3/os2/sched-os2.cpp \
         r3/os2/sems-os2.cpp \
@@ -431 +434 @@
         r3/darwin/filelock-darwin.cpp \
         r3/darwin/mp-darwin.cpp \
+        r3/darwin/rtProcInitExePath-darwin.cpp \
         r3/darwin/time-darwin.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
@@ -466 +470 @@
         generic/RTMpGetMaxFrequency-generic.cpp \
         r3/freebsd/alloc-freebsd.cpp \
+        r3/freebsd/rtProcInitExePath-freebsd.cpp \
         r3/posix/RTSystemQueryOSInfo-posix.cpp \
         r3/posix/dir-posix.cpp \
@@ -523 +528 @@
         r3/posix/utf8-posix.cpp \
         r3/solaris/alloc-solaris.cpp \
-        r3/solaris/mp-solaris.cpp
+        r3/solaris/mp-solaris.cpp \
+        r3/solaris/rtProcInitExePath-solaris.cpp
 
 ## PORTME: Porters add their selection of platform specific files for Ring-3 here.
@@ -556 +562 @@
         generic/uuid-generic.cpp \
         l4/l4-errno.cpp \
+        l4/rtProcInitExePath-l4.cpp \
         l4/process-l4env.cpp \
         l4/sems-l4env.cpp \

trunk/src/VBox/Runtime/include/internal/path.h

@@ -36 +36 @@
 
 __BEGIN_DECLS
-extern char g_szrtProgramPath[RTPATH_MAX];
 
 #if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)

trunk/src/VBox/Runtime/include/internal/process.h

@@ -33 +33 @@
 
 #include <iprt/process.h>
+#include <iprt/param.h>
 
 __BEGIN_DECLS
@@ -38 +39 @@
 extern RTPROCESS        g_ProcessSelf;
 extern RTPROCPRIORITY   g_enmProcessPriority;
+extern char             g_szrtProcExePath[RTPATH_MAX];
+extern size_t           g_cchrtProcExePath;
+extern size_t           g_cchrtProcDir;
+extern size_t           g_offrtProcName;
 
 /**
@@ -50 +55 @@
 int rtProcNativeSetPriority(RTPROCPRIORITY enmPriority);
 
+/**
+ * Determins the full path to the executable image.
+ * 
+ * This is called by rtR3Init.
+ * 
+ * @returns IPRT status code.
+ * 
+ * @param   pszPath     Pointer to the g_szrtProcExePath buffer.
+ * @param   cchPath     The size of the buffer.
+ */
+DECLHIDDEN(int) rtProcInitExePath(char *pszPath, size_t cchPath);
+
 __END_DECLS
 

trunk/src/VBox/Runtime/r3/init.cpp

@@ -69 +69 @@
 static bool volatile    g_fInitializing = false;
 
-/** Program path.
- * The size is hardcoded, so we'll have to check for overflow when setting it
- * since some hosts might support longer paths.
- * @internal
- */
-char        g_szrtProgramPath[RTPATH_MAX];
+/** The process path. 
+ * This is used by RTPathProgram and RTProcGetExecutableName and set by rtProcInitName. */
+char        g_szrtProcExePath[RTPATH_MAX];
+/** The length of g_szrtProcExePath. */
+size_t      g_cchrtProcExePath;
+/** The length of directory path component of g_szrtProcExePath. */
+size_t      g_cchrtProcDir;
+/** The offset of the process name into g_szrtProcExePath. */
+size_t      g_offrtProcName;
 
 /**
@@ -100 +103 @@
  */
 RTPROCPRIORITY g_enmProcessPriority = RTPROCPRIORITY_DEFAULT;
+
+
+
+/** 
+ * Internal worker which initializes or re-initializes the 
+ * program path, name and directory globals.
+ *
+ * @returns IPRT status code. 
+ * @param   pszProgramPath  The program path, NULL if not specified.
+ */
+static int rtR3InitProgramPath(const char *pszProgramPath)
+{
+    /*
+     * We're reserving 32 bytes here for file names as what not.
+     */
+    if (!pszProgramPath)
+    {
+        int rc = rtProcInitExePath(g_szrtProcExePath, sizeof(g_szrtProcExePath) - 32);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
+    else
+    {
+        size_t cch = strlen(pszProgramPath);
+        Assert(cch > 1);
+        AssertMsgReturn(cch < sizeof(g_szrtProcExePath) - 32, ("%zu\n", cch), VERR_BUFFER_OVERFLOW);
+        memcpy(g_szrtProcExePath, pszProgramPath, cch + 1);
+    }
+
+    /*
+     * Parse the name.
+     */
+    ssize_t offName;
+    g_cchrtProcExePath = RTPathParse(g_szrtProcExePath, &g_cchrtProcDir, &offName, NULL);
+    g_offrtProcName = offName;
+    return VINF_SUCCESS;
+}
 
 
@@ -111 +151 @@
 static int rtR3Init(bool fInitSUPLib, const char *pszProgramPath)
 {
+    int rc = VINF_SUCCESS;
     /* no entry log flow, because prefixes and thread may freak out. */
 
@@ -128 +169 @@
             SUPR3Init(NULL);
 #endif
+        if (pszProgramPath)
+            rc = rtR3InitProgramPath(pszProgramPath);
+        return rc;
     }
     ASMAtomicWriteBool(&g_fInitializing, true);
@@ -154 +198 @@
      * without having initialized TLS entries and suchlike.
      */
-    int rc = rtThreadInit();
+    rc = rtThreadInit();
     if (RT_FAILURE(rc))
     {
-        AssertMsgFailed(("Failed to get executable directory path, rc=%d!\n", rc));
+        AssertMsgFailed(("Failed to initialize threads, rc=%Rrc!\n", rc));
         ASMAtomicWriteBool(&g_fInitializing, false);
         ASMAtomicDecS32(&g_cUsers);
@@ -181 +225 @@
     g_u64ProgramStartMilliTS = g_u64ProgramStartNanoTS / 1000000;
 
-#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
-    /*
-     * The threading is initialized we can safely sleep a bit if GIP
-     * needs some time to update itself updating.
-     */
-    if (fInitSUPLib && g_pSUPGlobalInfoPage)
-    {
-        RTThreadSleep(20);
-        RTTimeNanoTS();
-    }
-#endif
-
-    /*
-     * Get the executable path.
-     *
-     * We're also checking the depth here since we'll be
-     * appending filenames to the executable path. Currently
-     * we assume 16 bytes are what we need.
-     */
-    char szPath[RTPATH_MAX - 16];
-    rc = RTPathProgram(szPath, sizeof(szPath));
-    if (RT_FAILURE(rc))
-    {
-        AssertMsgFailed(("Failed to get executable directory path, rc=%d!\n", rc));
-        ASMAtomicWriteBool(&g_fInitializing, false);
-        ASMAtomicDecS32(&g_cUsers);
-        return rc;
-    }
-
     /*
      * The Process ID.
@@ -220 +235 @@
 
     /*
-     * More stuff to come.
+     * The executable path, name and directory.
+     */
+    rc = rtR3InitProgramPath(pszProgramPath);
+    if (RT_FAILURE(rc))
+    {
+        AssertLogRelMsgFailed(("Failed to get executable directory path, rc=%Rrc!\n", rc));
+        ASMAtomicWriteBool(&g_fInitializing, false);
+        ASMAtomicDecS32(&g_cUsers);
+        return rc;
+    }
+
+#if !defined(IN_GUEST) && !defined(RT_NO_GIP)
+    /*
+     * The threading is initialized we can safely sleep a bit if GIP
+     * needs some time to update itself updating.
+     */
+    if (fInitSUPLib && g_pSUPGlobalInfoPage)
+    {
+        RTThreadSleep(20);
+        RTTimeNanoTS();
+    }
+#endif
+
+    /*
+     * More stuff to come?
      */
 

trunk/src/VBox/Runtime/r3/path.cpp

@@ -44 +44 @@
 #include "internal/fs.h"
 #include "internal/path.h"
+#include "internal/process.h"
 
 
@@ -121 +122 @@
 
 /**
- * Finds the filename in a path.
- *
- * @returns Pointer to filename within pszPath.
- * @returns NULL if no filename (i.e. empty string or ends with a slash).
+ * Parses a path.
+ * 
+ * It figures the length of the directory component, the offset of 
+ * the file name and the location of the suffix dot.
+ *
+ * @returns The path length.
+ * 
  * @param   pszPath     Path to find filename in.
- */
-RTDECL(char *) RTPathFilename(const char *pszPath)
+ * @param   pcbDir      Where to put the length of the directory component.
+ *                      If no directory, this will be 0. Optional.
+ * @param   poffName    Where to store the filename offset.
+ *                      If empty string or if it's ending with a slash this
+ *                      will be set to -1. Optional.
+ * @param   poffSuff    Where to store the suffix offset (the last dot).
+ *                      If empty string or if it's ending with a slash this
+ *                      will be set to -1. Optional.
+ * @param   pfFlags     Where to set flags returning more information about 
+ *                      the path. For the future. Optional.
+ */
+RTDECL(size_t) RTPathParse(const char *pszPath, size_t *pcchDir, ssize_t *poffName, ssize_t *poffSuff)
 {
     const char *psz = pszPath;
-    const char *pszLastComp = pszPath;
+    ssize_t     offRoot = 0;
+    const char *pszName = pszPath;
+    const char *pszLastDot = NULL;
 
     for (;; psz++)
@@ -139 +155 @@
 #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
             case ':':
-                pszLastComp = psz + 1;
+                pszName = psz + 1;
+                cchRoot = pszName - psz;
                 break;
 
@@ -145 +162 @@
 #endif
             case '/':
-                pszLastComp = psz + 1;
+                pszName = psz + 1;
+                break;
+
+            case '.':
+                pszLastDot = psz;
+                break;
+
+            /* 
+             * The end. Complete the results.
+             */
+            case '\0':
+            {
+                ssize_t offName = *pszName != '\0' ? pszName - pszPath : -1;
+                if (poffName)
+                    *poffName = offName;
+
+                if (poffSuff)
+                {
+                    ssize_t offSuff = -1;
+                    if (pszLastDot)
+                    {
+                        offSuff = pszLastDot - pszPath;
+                        if (offSuff <= offName)
+                            offSuff = -1;
+                    }
+                    *poffSuff = offSuff;
+                }
+
+                if (pcchDir)
+                {
+                    ssize_t off = offName - 1;
+                    while (off >= offRoot && RTPATH_IS_SLASH(pszPath[off]))
+                        off--;
+                    *pcchDir = RT_MAX(off, offRoot) + 1;
+                }
+
+                return psz - pszPath;
+            }
+        }
+    }
+
+    /* will never get here */
+    return 0;
+}
+
+
+/**
+ * Finds the filename in a path.
+ *
+ * @returns Pointer to filename within pszPath.
+ * @returns NULL if no filename (i.e. empty string or ends with a slash).
+ * @param   pszPath     Path to find filename in.
+ */
+RTDECL(char *) RTPathFilename(const char *pszPath)
+{
+    const char *psz = pszPath;
+    const char *pszName = pszPath;
+
+    for (;; psz++)
+    {
+        switch (*psz)
+        {
+            /* handle separators. */
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+            case ':':
+                pszName = psz + 1;
+                break;
+
+            case '\\':
+#endif
+            case '/':
+                pszName = psz + 1;
                 break;
 
             /* the end */
             case '\0':
-                if (*pszLastComp)
-                    return (char *)(void *)pszLastComp;
+                if (*pszName)
+                    return (char *)(void *)pszName;
                 return NULL;
         }
@@ -560 +648 @@
 #ifndef RT_MINI
 
+RTDECL(int) RTPathProgram(char *pszPath, unsigned cchPath)
+{
+    AssertReturn(g_szrtProcExePath[0], VERR_WRONG_ORDER);
+
+    /*
+     * Calc the length and check if there is space before copying.
+     */
+    size_t cch = g_cchrtProcDir;
+    if (cch <= cchPath)
+    {
+        memcpy(pszPath, g_szrtProcExePath, cch);
+        pszPath[cch] = '\0';
+        return VINF_SUCCESS;
+    }
+
+    AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cchPath, cch));
+    return VERR_BUFFER_OVERFLOW;
+}
+
+
 /**
  * Gets the directory for architecture-independent application data, for

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -43 +43 @@
 #include <sys/types.h>
 #include <pwd.h>
-#ifdef RT_OS_DARWIN
-# include <mach-o/dyld.h>
-#endif
 
 #include <iprt/path.h>
@@ -53 +50 @@
 #include <iprt/log.h>
 #include "internal/path.h"
+#include "internal/process.h"
 #include "internal/fs.h"
 
@@ -402 +400 @@
     return rc;
 }
-
-
-#ifndef RT_MINI
-RTDECL(int) RTPathProgram(char *pszPath, unsigned cchPath)
-{
-    /*
-     * First time only.
-     */
-    if (!g_szrtProgramPath[0])
-    {      
-        char* envPath = getenv("VBOX_PROGRAM_PATH");
-        if (envPath) 
-        {
-          strncpy(g_szrtProgramPath, envPath, sizeof(g_szrtProgramPath));
-        } else {
-        /*
-         * Linux have no API for obtaining the executable path, but provides a symbolic link
-         * in the proc file system. Note that readlink is one of the weirdest Unix apis around.
-         *
-         * OS/2 have an api for getting the program file name.
-         */
-/** @todo use RTProcGetExecutableName() */
-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS)
-# ifdef RT_OS_LINUX
-        int cchLink = readlink("/proc/self/exe", &g_szrtProgramPath[0], sizeof(g_szrtProgramPath) - 1);
-# elif defined(RT_OS_SOLARIS)
-        char szFileBuf[PATH_MAX + 1];
-        sprintf(szFileBuf, "/proc/%ld/path/a.out", (long)getpid());
-        int cchLink = readlink(szFileBuf, &g_szrtProgramPath[0], sizeof(g_szrtProgramPath) - 1);
-# else /* RT_OS_FREEBSD: */
-        int cchLink = readlink("/proc/curproc/file", &g_szrtProgramPath[0], sizeof(g_szrtProgramPath) - 1);
-# endif
-        if (cchLink < 0 || cchLink == sizeof(g_szrtProgramPath) - 1)
-        {
-            int rc = RTErrConvertFromErrno(errno);
-            AssertMsgFailed(("couldn't read /proc/self/exe. errno=%d cchLink=%d\n", errno, cchLink));
-            LogFlow(("RTPathProgram(%p, %u): returns %Rrc\n", pszPath, cchPath, rc));
-            return rc;
-        }
-        g_szrtProgramPath[cchLink] = '\0';
-
-#elif defined(RT_OS_OS2) || defined(RT_OS_L4)
-        _execname(g_szrtProgramPath, sizeof(g_szrtProgramPath));
-
-#elif defined(RT_OS_DARWIN)
-        const char *pszImageName = _dyld_get_image_name(0);
-        AssertReturn(pszImageName, VERR_INTERNAL_ERROR);
-        size_t cchImageName = strlen(pszImageName);
-        if (cchImageName >= sizeof(g_szrtProgramPath))
-            AssertReturn(pszImageName, VERR_INTERNAL_ERROR);
-        memcpy(g_szrtProgramPath, pszImageName, cchImageName + 1);
-
-#else
-# error needs porting.
-#endif
-        }
-        /*
-         * Convert to UTF-8 and strip of the filename.
-         */
-        char *pszTmp = NULL;
-        int rc = rtPathFromNative(&pszTmp, &g_szrtProgramPath[0]);
-        if (RT_FAILURE(rc))
-        {
-            LogFlow(("RTPathProgram(%p, %u): returns %Rrc\n", pszPath, cchPath, rc));
-            return rc;
-        }
-        size_t cch = strlen(pszTmp);
-        if (cch >= sizeof(g_szrtProgramPath))
-        {
-            RTStrFree(pszTmp);
-            LogFlow(("RTPathProgram(%p, %u): returns %Rrc\n", pszPath, cchPath, VERR_BUFFER_OVERFLOW));
-            return VERR_BUFFER_OVERFLOW;
-        }
-        memcpy(g_szrtProgramPath, pszTmp, cch + 1);
-        RTPathStripFilename(g_szrtProgramPath);
-        RTStrFree(pszTmp);
-    }
-
-    /*
-     * Calc the length and check if there is space before copying.
-     */
-    unsigned cch = strlen(g_szrtProgramPath) + 1;
-    if (cch <= cchPath)
-    {
-        memcpy(pszPath, g_szrtProgramPath, cch + 1);
-        LogFlow(("RTPathProgram(%p:{%s}, %u): returns %Rrc\n", pszPath, pszPath, cchPath, VINF_SUCCESS));
-        return VINF_SUCCESS;
-    }
-
-    AssertMsgFailed(("Buffer too small (%d < %d)\n", cchPath, cch));
-    LogFlow(("RTPathProgram(%p, %u): returns %Rrc\n", pszPath, cchPath, VERR_BUFFER_OVERFLOW));
-    return VERR_BUFFER_OVERFLOW;
-}
-#endif /* !RT_MINI */
 
 

trunk/src/VBox/Runtime/r3/posix/process-posix.cpp

@@ -235 +235 @@
 
 
-RTR3DECL(char *) RTProcGetExecutableName(char *pszExecName, size_t cchExecName)
-{
-    /*
-     * I don't think there is a posix API for this, but
-     * because I'm lazy I'm not creating OS specific code
-     * files and code for this.
-     */
-#if defined(RT_OS_LINUX) || defined(RT_OS_FREEBSD) || defined(RT_OS_SOLARIS)
-# ifdef RT_OS_LINUX
-    int cchLink = readlink("/proc/self/exe", pszExecName, cchExecName - 1);
-# elif defined(RT_OS_SOLARIS)
-    char szFileBuf[80];
-    RTStrPrintf(szFileBuf, sizeof(szFileBuf), "/proc/%ld/path/a.out", (long)getpid());
-    int cchLink = readlink(szFileBuf, pszExecName, cchExecName - 1);
-# else
-    int cchLink = readlink("/proc/curproc/file", pszExecName, cchExecName - 1);
-# endif
-    if (cchLink > 0 && (size_t)cchLink <= cchExecName - 1)
-    {
-        pszExecName[cchLink] = '\0';
-        return pszExecName;
-    }
-
-#elif defined(RT_OS_OS2) || defined(RT_OS_L4)
-    if (!_execname(pszExecName, cchExecName))
-        return pszExecName;
-
-#elif defined(RT_OS_DARWIN)
-    const char *pszImageName = _dyld_get_image_name(0);
-    if (pszImageName)
-    {
-        size_t cchImageName = strlen(pszImageName);
-        if (cchImageName < cchExecName)
-            return (char *)memcpy(pszExecName, pszImageName, cchImageName + 1);
-    }
-
-#else
-#   error "Port me!"
-#endif
-    return NULL;
-}
-
 /**
  * Daemonize the current process, making it a background process. The current

trunk/src/VBox/Runtime/r3/process.cpp

@@ -37 +37 @@
 #include <iprt/assert.h>
 #include <iprt/err.h>
+#include <iprt/string.h>
 #include "internal/process.h"
 #include "internal/thread.h"
@@ -94 +95 @@
 }
 
+
+RTR3DECL(char *) RTProcGetExecutableName(char *pszExecName, size_t cchExecName)
+{
+    AssertReturn(g_szrtProcExePath[0] != '\0', NULL);
+
+    /*
+     * Calc the length and check if there is space before copying.
+     */
+    size_t cch = g_cchrtProcExePath;
+    if (cch <= cchExecName)
+    {
+        memcpy(pszExecName, g_szrtProcExePath, cch);
+        pszExecName[cch] = '\0';
+        return pszExecName;
+    }
+
+    AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cchExecName, cch));
+    return NULL;
+}
+

trunk/src/VBox/Runtime/r3/win/path-win.cpp

@@ -120 +120 @@
 
     return rc;
-}
-
-
-/**
- * Gets the program path.
- *
- * @returns iprt status code.
- * @param   pszPath     Buffer where to store the path.
- * @param   cchPath     Buffer size in bytes.
- */
-RTDECL(int) RTPathProgram(char *pszPath, unsigned cchPath)
-{
-    /*
-     * First time only.
-     */
-    if (!g_szrtProgramPath[0])
-    {
-        HMODULE hExe = GetModuleHandle(NULL);
-        if (!GetModuleFileName(hExe, &g_szrtProgramPath[0], sizeof(g_szrtProgramPath)))
-        {
-            AssertMsgFailed(("Couldn't get exe module name. lasterr=%d\n", GetLastError()));
-            return RTErrConvertFromWin32(GetLastError());
-        }
-        RTPathStripFilename(g_szrtProgramPath);
-    }
-
-    /*
-     * Calc the length and check if there is space before copying.
-     */
-    unsigned cch = strlen(g_szrtProgramPath) + 1;
-    if (cch <= cchPath)
-    {
-        memcpy(pszPath, g_szrtProgramPath, cch + 1);
-        return VINF_SUCCESS;
-    }
-
-    AssertMsgFailed(("Buffer too small (%d < %d)\n", cchPath, cch));
-    return VERR_BUFFER_OVERFLOW;
 }
 

trunk/src/VBox/Runtime/r3/win/process-win.cpp

@@ -244 +244 @@
 }
 
-
-RTR3DECL(char *) RTProcGetExecutableName(char *pszExecName, size_t cchExecName)
-{
-    HMODULE hExe = GetModuleHandle(NULL);
-    if (GetModuleFileName(hExe, pszExecName, cchExecName))
-        return pszExecName;
-    return NULL;
-}
-

trunk/src/VBox/Runtime/testcase/tstPath.cpp

@@ -33 +33 @@
 *******************************************************************************/
 #include <iprt/path.h>
-#include <iprt/runtime.h>
+#include <iprt/process.h>
+#include <iprt/initterm.h>
 #include <iprt/stream.h>
 #include <iprt/err.h>
@@ -45 +46 @@
         { \
             cErrors++; \
-            RTPrintf("\ntstPath: FAILED calling " #method " at line %d: rc=%Vrc\n", __LINE__, rc); \
+            RTPrintf("\ntstPath: FAILED calling " #method " at line %d: rc=%Rrc\n", __LINE__, rc); \
         } \
     } while (0)
@@ -61 +62 @@
 
     /*
-     * RTPathProgram, RTPathUserHome
+     * RTPathProgram, RTPathUserHome and RTProcGetExecutableName.
      */
     char szPath[RTPATH_MAX];
@@ -70 +71 @@
     if (RT_SUCCESS(rc))
         RTPrintf("UserHome={%s}\n", szPath);
+    if (RTProcGetExecutableName(szPath, sizeof(szPath)) == szPath)
+        RTPrintf("ExecutableName={%s}\n", szPath);
+    else
+    {
+        RTPrintf("tstPath: FAILED - RTProcGetExecutableName\n");
+        cErrors++;
+    }
+    
 
     /*