Changeset 25942 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 20, 2010 5:26:22 PM (15 years ago)

Author:

vboxsync

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

56784

Message:

*: RTEnv usage cleanup - avoid RTEnvGet() as it doesn't necessarily return UTF-8 encoded strings.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/main.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -34 +34 @@
 #include <iprt/initterm.h>
 #include <iprt/path.h>
+#include <iprt/param.h>
 #include <iprt/stream.h>
 #include <iprt/string.h>
@@ -50 +51 @@
 /** The name of our pidfile.  It is global for the benefit of the cleanup
  * routine. */
-static char *g_pszPidFile;
+static char g_szPidFile[RTPATH_MAX];
 /** The file handle of our pidfile.  It is global for the benefit of the
  * cleanup routine. */
@@ -64 +65 @@
         delete g_pService;
     }
-    if (g_pszPidFile && g_hPidFile)
-        VbglR3ClosePidFile(g_pszPidFile, g_hPidFile);
+    if (g_szPidFile && g_hPidFile)
+        VbglR3ClosePidFile(g_szPidFile, g_hPidFile);
     VbglR3Term();
     exit(0);
@@ -230 +231 @@
         }
     }
-    const char *pszHome = RTEnvGet("HOME");
-    if (pszHome == NULL)
-    {
-        RTPrintf("VBoxClient: failed to get home directory.  Exiting.\n");
-        Log(("VBoxClient: failed to get home directory.  Exiting.\n"));
-        return 1;
-    }
-    if (RTStrAPrintf(&g_pszPidFile, "%s/%s", pszHome, g_pService->getPidFilePath()) == -1)
-    if (pszHome == NULL)
-    {
-        RTPrintf("VBoxClient: out of memory.  Exiting.\n");
-        Log(("VBoxClient: out of memory.  Exiting.\n"));
-        return 1;
-    }
+    /** @todo explain why we aren't using RTPathUserHome here so it doesn't get
+     *        changed accidentally during some cleanup effort. */
+    rc = RTEnvGetEx(RTENV_DEFAULT, "HOME", g_szPidFile, sizeof(g_szPidFile), NULL);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("VBoxClient: failed to get home directory, rc=%Rrc.  Exiting.\n", rc);
+        Log(("VBoxClient: failed to get home directory, rc=%Rrc.  Exiting.\n", rc));
+        return 1;
+    }
+    rc = RTPathAppend(g_szPidFile, sizeof(g_szPidFile), g_pService->getPidFilePath());
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("VBoxClient: RTPathAppend failed with rc=%Rrc.  Exiting.\n", rc);
+        Log(("VBoxClient: RTPathAppend failed with rc=%Rrc.  Exiting.\n", rc));
+        return 1;
+    }
+
     /* Initialise the guest library. */
     if (RT_FAILURE(VbglR3InitUser()))
@@ -251 +255 @@
         return 1;
     }
-    if (g_pszPidFile && RT_FAILURE(VbglR3PidFile(g_pszPidFile, &g_hPidFile)))
+    if (g_szPidFile && RT_FAILURE(VbglR3PidFile(g_szPidFile, &g_hPidFile)))
     {
         RTPrintf("Failed to create a pidfile.  Exiting.\n");