Changeset 42069 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 9, 2012 6:10:08 PM (13 years ago)

Author:

vboxsync

Message:

Autostart: Simplify getting the username, use the new IPRT API

File:

• trunk/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp

@@ -32 +32 @@
 #if defined(RT_OS_LINUX)
 /**
- * Return the username of the current process.
- *
- * @returns Pointer to the string containing the username of
- *          NULL in case of an error. Free with RTMemFree().
- */
-static int autostartGetProcessUser(char **ppszUser)
-{
-    int rc = VINF_SUCCESS;
-    size_t cbUser = 128;
-    char *pszUser = (char *)RTMemAllocZ(cbUser);
-
-    if (pszUser)
-    {
-        rc = RTProcQueryUsername(RTProcSelf(), pszUser, cbUser, &cbUser);
-        if (rc == VERR_BUFFER_OVERFLOW)
-        {
-            char *pszTmp = (char *)RTMemRealloc(pszUser, cbUser);
-            if (pszTmp)
-            {
-                pszUser = pszTmp;
-                rc = RTProcQueryUsername(RTProcSelf(), pszUser, cbUser, &cbUser);
-                Assert(rc != VERR_BUFFER_OVERFLOW);
-            }
-        }
-
-        if (RT_FAILURE(rc))
-        {
-            RTMemFree(pszUser);
-            pszUser = NULL;
-        }
-        else
-            *ppszUser = pszUser;
-    }
-
-    return rc;
-}
-
-/**
  * Modifies the autostart database.
  *
@@ -81 +43 @@
     char *pszUser = NULL;
 
-    rc = autostartGetProcessUser(&pszUser);
-    if (   RT_SUCCESS(rc)
-        && pszUser)
+    rc = RTProcQueryUsernameA(RTProcSelf(), &pszUser);
+    if (RT_SUCCESS(rc))
     {
         char *pszFile;
         uint64_t fOpen = RTFILE_O_DENY_ALL | RTFILE_O_READWRITE;
         RTFILE hAutostartFile;
+
+        AssertPtr(pszUser);
 
         if (fAddVM)
@@ -162 +125 @@
             RTStrFree(pszFile);
         }
+
+        RTStrFree(pszUser);
     }
-    else if (pszUser)
-        rc = VERR_NOT_SUPPORTED;
 
     return rc;