Changeset 31867 in vbox

Timestamp:

Aug 23, 2010 3:21:58 PM (14 years ago)

Author:

vboxsync

Message:

VBoxService/VMInfo: Added utmpx support for Solaris (and later FreeBSD 9).

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -36 +36 @@
 # include <net/if.h>
 # include <unistd.h>
-# ifndef RT_OS_FREEBSD /* The header does not exist anymore since FreeBSD 9-current */
-#  include <utmp.h>
+# ifndef RT_OS_FREEBSD
+#  include <utmpx.h> /* @todo FreeBSD 9 should have this. */
 # endif
 # ifdef RT_OS_SOLARIS
@@ -215 +215 @@
 static int vboxserviceVMInfoWriteUsers(void)
 {
-    int rc;
+    int rc = VINF_SUCCESS;
     char *pszUserList = NULL;
     uint32_t cUsersInList = 0;
@@ -227 +227 @@
 
 #elif defined(RT_OS_FREEBSD)
-    /** @todo FreeBSD: Port logged on user info retrival. */
+    /** @todo FreeBSD: Port logged on user info retrival.
+     *                 However, FreeBSD 9 supports utmpx, so we could use the code
+     *                 block below (?). */
     rc = VERR_NOT_IMPLEMENTED;
 
@@ -235 +237 @@
 
 #else
-    /** @todo Add utmpx support? */
-    rc = utmpname(UTMP_FILE);
-# ifdef RT_OS_SOLARIS
-    if (rc != 1)
-# else
-    if (rc != 0)
-# endif
-    {
-        VBoxServiceError("VMInfo/Users: Could not set UTMP file! Error: %ld\n", errno);
-        rc = VERR_GENERAL_FAILURE;
-    }
-    else
-        rc = VINF_SUCCESS;
-
-    setutent();
-    utmp *ut_user;
+    setutxent();
+    utmpx *ut_user;
     uint32_t cListSize = 32;
 
@@ -259 +247 @@
 
     /* Process all entries in the utmp file. */
-    while (   (ut_user = getutent())
+    while (   (ut_user = getutxent())
            && RT_SUCCESS(rc))
     {
@@ -316 +304 @@
     RTMemFree(papszUsers);
 
-    endutent(); /* Close utmp file. */
+    endutxent(); /* Close utmpx file. */
 #endif
     Assert(RT_FAILURE(rc) || cUsersInList == 0 || (pszUserList && *pszUserList));