Changeset 25942 in vbox for trunk/src/VBox/Main/glue/com.cpp

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/Main/glue/com.cpp (modified) (5 diffs)

trunk/src/VBox/Main/glue/com.cpp

@@ -138 +138 @@
 }
 
-int GetVBoxUserHomeDirectory (char *aDir, size_t aDirLen)
+int GetVBoxUserHomeDirectory(char *aDir, size_t aDirLen)
 {
     AssertReturn(aDir, VERR_INVALID_POINTER);
@@ -146 +146 @@
     *aDir = 0;
 
-    const char *VBoxUserHome = RTEnvGet ("VBOX_USER_HOME");
+    const char *VBoxUserHome = RTEnvGet("VBOX_USER_HOME");
 
     char path [RTPATH_MAX];
@@ -155 +155 @@
         /* get the full path name */
         char *VBoxUserHomeUtf8 = NULL;
-        vrc = RTStrCurrentCPToUtf8 (&VBoxUserHomeUtf8, VBoxUserHome);
+        vrc = RTStrCurrentCPToUtf8(&VBoxUserHomeUtf8, VBoxUserHome);
         if (RT_SUCCESS(vrc))
         {
-            vrc = RTPathAbs (VBoxUserHomeUtf8, path, sizeof (path));
+            vrc = RTPathAbs(VBoxUserHomeUtf8, path, sizeof (path));
             if (RT_SUCCESS(vrc))
             {
-                if (aDirLen < strlen (path) + 1)
+                if (aDirLen < strlen(path) + 1)
                     vrc = VERR_BUFFER_OVERFLOW;
                 else
-                    strcpy (aDir, path);
+                    strcpy(aDir, path);
             }
-            RTStrFree (VBoxUserHomeUtf8);
+            RTStrFree(VBoxUserHomeUtf8);
         }
     }
@@ -172 +172 @@
     {
         /* compose the config directory (full path) */
-        vrc = RTPathUserHome (path, sizeof (path));
+        vrc = RTPathUserHome(path, sizeof(path));
         if (RT_SUCCESS(vrc))
         {
-            size_t len =
-                RTStrPrintf (aDir, aDirLen, "%s%c%s",
-                             path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
-            if (len != strlen (path) + 1 + strlen (VBOX_USER_HOME_SUFFIX))
+            size_t len = RTStrPrintf(aDir, aDirLen, "%s%c%s",
+                                     path, RTPATH_DELIMITER, VBOX_USER_HOME_SUFFIX);
+            if (len != strlen(path) + 1 + strlen (VBOX_USER_HOME_SUFFIX))
                 vrc = VERR_BUFFER_OVERFLOW;
         }
@@ -185 +184 @@
     /* ensure the home directory exists */
     if (RT_SUCCESS(vrc))
-        if (!RTDirExists (aDir))
-            vrc = RTDirCreateFullPath (aDir, 0777);
+        if (!RTDirExists(aDir))
+            vrc = RTDirCreateFullPath(aDir, 0777);
 
     return vrc;