Changeset 21199 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Jul 3, 2009 1:23:29 PM (16 years ago)

Author:

vboxsync

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

49502

Message:

VBoxGuest-linux.c,VBoxGuestR3Lib.cpp: Fixed ioctl error check for linux. Made sure no more VBox error status codes are lost in translation (linux only, but the principle is portable to *BSD and Solaris).

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp

@@ -32 +32 @@
 # include <os2.h>
 
-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+#elif defined(RT_OS_FREEBSD) \
+   || defined(RT_OS_LINUX) \
+   || defined(RT_OS_SOLARIS)
 # include <sys/types.h>
 # include <sys/stat.h>
+# if defined(RT_OS_LINUX) /** @todo check this on solaris+freebsd as well. */
+#  include <sys/ioctl.h>
+# endif
 # include <errno.h>
 # include <unistd.h>
@@ -375 +380 @@
     return VINF_SUCCESS;
 
+#elif defined(RT_OS_LINUX)
+    int rc = ioctl((int)g_File, iFunction, pvData);
+    if (RT_LIKELY(rc == 0))
+        return VINF_SUCCESS;
+
+    /* Positive values are negated VBox error status codes. */
+    if (rc > 0)
+        rc = -rc;
+    else
+        rc = RTErrConvertFromErrno(errno);
+    NOREF(cbData);
+    return rc;
+
 #elif defined(VBOX_VBGLR3_XFREE86)
     /* PORTME - This is preferred over the RTFileIOCtl variant below, just be careful with the (int). */