Changeset 19924 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

May 22, 2009 9:52:47 PM (16 years ago)

Author:

vboxsync

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

47626

Message:

IPRT,SUP: Renamed RTPathProgram to RTPathExecDir to make it clear what it returns. Renamed hardened version of it as well.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPLibInternal.h (modified) (2 diffs)
• SUPR3HardenedIPRT.cpp (modified) (1 diff)
• SUPR3HardenedMain.cpp (modified) (9 diffs)
• SUPR3HardenedVerify.cpp (modified) (2 diffs)
• win/SUPLib-win.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

@@ -79 +79 @@
 # define supR3HardenedPathSharedLibs       supR3HardenedStaticPathSharedLibs
 # define supR3HardenedPathAppDocs          supR3HardenedStaticPathAppDocs
-# define supR3HardenedPathProgram          supR3HardenedStaticPathProgram
+# define supR3HardenedPathExecDir          supR3HardenedStaticPathExecDir
 # define supR3HardenedPathFilename         supR3HardenedStaticPathFilename
 # define supR3HardenedFatalV               supR3HardenedStaticFatalV
@@ -274 +274 @@
 /** @copydoc RTPathAppDocs */
 DECLHIDDEN(int)    supR3HardenedPathAppDocs(char *pszPath, size_t cchPath);
-/** @copydoc RTPathProgram */
-DECLHIDDEN(int)    supR3HardenedPathProgram(char *pszPath, size_t cchPath);
+/** @copydoc RTPathExecDir */
+DECLHIDDEN(int)    supR3HardenedPathExecDir(char *pszPath, size_t cchPath);
 /** @copydoc RTPathFilename */
 DECLHIDDEN(char *) supR3HardenedPathFilename(const char *pszPath);

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp

@@ -91 +91 @@
 
 /**
- * @copydoc RTPathProgram
+ * @copydoc RTPathExecDir
  */
-DECLHIDDEN(int) supR3HardenedPathProgram(char *pszPath, size_t cchPath)
+DECLHIDDEN(int) supR3HardenedPathExecDir(char *pszPath, size_t cchPath)
 {
-    return RTPathProgram(pszPath, cchPath);
+    return RTPathExecDir(pszPath, cchPath);
 }
 

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

@@ -235 +235 @@
 
 #else
-    return supR3HardenedPathProgram(pszPath, cchPath);
+    return supR3HardenedPathExecDir(pszPath, cchPath);
 #endif
 }
@@ -255 +255 @@
 
 #else
-    return supR3HardenedPathProgram(pszPath, cchPath);
+    return supR3HardenedPathExecDir(pszPath, cchPath);
 #endif
 }
@@ -275 +275 @@
 
 #else
-    return supR3HardenedPathProgram(pszPath, cchPath);
+    return supR3HardenedPathExecDir(pszPath, cchPath);
 #endif
 }
@@ -295 +295 @@
 
 #else
-    return supR3HardenedPathProgram(pszPath, cchPath);
+    return supR3HardenedPathExecDir(pszPath, cchPath);
 #endif
 }
@@ -329 +329 @@
 # endif
     if (cchLink < 0 || cchLink == sizeof(g_szSupLibHardenedExePath) - 1)
-        supR3HardenedFatal("supR3HardenedPathProgram: couldn't read \"%s\", errno=%d cchLink=%d\n",
+        supR3HardenedFatal("supR3HardenedExecDir: couldn't read \"%s\", errno=%d cchLink=%d\n",
                             g_szSupLibHardenedExePath, errno, cchLink);
     g_szSupLibHardenedExePath[cchLink] = '\0';
@@ -339 +339 @@
     const char *pszImageName = _dyld_get_image_name(0);
     if (!pszImageName)
-        supR3HardenedFatal("supR3HardenedPathProgram: _dyld_get_image_name(0) failed\n");
+        supR3HardenedFatal("supR3HardenedExecDir: _dyld_get_image_name(0) failed\n");
     size_t cchImageName = strlen(pszImageName);
     if (!cchImageName || cchImageName >= sizeof(g_szSupLibHardenedExePath))
-        supR3HardenedFatal("supR3HardenedPathProgram: _dyld_get_image_name(0) failed, cchImageName=%d\n", cchImageName);
+        supR3HardenedFatal("supR3HardenedExecDir: _dyld_get_image_name(0) failed, cchImageName=%d\n", cchImageName);
     memcpy(g_szSupLibHardenedExePath, pszImageName, cchImageName + 1);
 
@@ -348 +348 @@
     HMODULE hExe = GetModuleHandle(NULL);
     if (!GetModuleFileName(hExe, &g_szSupLibHardenedExePath[0], sizeof(g_szSupLibHardenedExePath)))
-        supR3HardenedFatal("supR3HardenedPathProgram: GetModuleFileName failed, rc=%d\n", GetLastError());
+        supR3HardenedFatal("supR3HardenedExecDir: GetModuleFileName failed, rc=%d\n", GetLastError());
 #else
 # error needs porting.
@@ -381 +381 @@
 
 /**
- * @copydoc RTPathProgram
- */
-DECLHIDDEN(int) supR3HardenedPathProgram(char *pszPath, size_t cchPath)
+ * @copydoc RTPathExecDir
+ */
+DECLHIDDEN(int) supR3HardenedPathExecDir(char *pszPath, size_t cchPath)
 {
     /*
@@ -401 +401 @@
     }
 
-    supR3HardenedFatal("supR3HardenedPathProgram: Buffer too small (%u < %u)\n", cchPath, cch);
+    supR3HardenedFatal("supR3HardenedPathExecDir: Buffer too small (%u < %u)\n", cchPath, cch);
     return VERR_BUFFER_OVERFLOW;
 }

trunk/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp

@@ -216 +216 @@
         case kSupID_AppBin: /** @todo fix this AppBin crap (uncertain wtf some binaries actually are installed). */
         case kSupID_Bin:
-            rc = supR3HardenedPathProgram(pszDst, cchDst);
+            rc = supR3HardenedPathExecDir(pszDst, cchDst);
             break;
         case kSupID_SharedLib:
@@ -678 +678 @@
 
                 char szFilename[RTPATH_MAX];
-                int rc2 = supR3HardenedPathProgram(szFilename, sizeof(szFilename) - cchProgName - sizeof(SUPLIB_EXE_SUFF));
+                int rc2 = supR3HardenedPathExecDir(szFilename, sizeof(szFilename) - cchProgName - sizeof(SUPLIB_EXE_SUFF));
                 if (RT_SUCCESS(rc2))
                 {

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -182 +182 @@
     {
         char szDriver[RTPATH_MAX];
-        int rc = RTPathProgram(szDriver, sizeof(szDriver) - sizeof("\\VBoxDrv.sys"));
+        int rc = RTPathExecDir(szDriver, sizeof(szDriver) - sizeof("\\VBoxDrv.sys"));
         if (RT_SUCCESS(rc))
         {
@@ -333 +333 @@
         {
             char szDriver[RTPATH_MAX];
-            int rc = RTPathProgram(szDriver, sizeof(szDriver) - sizeof("\\VBoxDrv.sys"));
+            int rc = RTPathExecDir(szDriver, sizeof(szDriver) - sizeof("\\VBoxDrv.sys"));
             if (RT_SUCCESS(rc))
             {