Changeset 4808 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Sep 14, 2007 4:18:20 PM (17 years ago)

Author:

vboxsync

Message:

Added an RTErrnoConvertFromErr function to simplify error management inside the Linux Additions kernel modules

Location:

trunk/src/VBox/Additions/linux

Files:

• Makefile.kmk (modified) (1 diff)
• sharedfolders/Makefile.module (modified) (1 diff)
• sharedfolders/dirops.c (modified) (2 diffs)
• sharedfolders/files_vboxvfs (modified) (1 diff)
• sharedfolders/utils.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/Makefile.kmk

@@ -46 +46 @@
 # folders kernel modules.
 $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \
-                $(INSTARGET_vboxmod-bin) \
+                $(PATH_OBJ)/src/VBox/Additions/linux/module/vboxadd/vboxadd$(TEMPLATE_VBOXLNX32GUESTR0_SYSSUFF) \
+                $(PATH_OBJ)/src/VBox/Additions/linux/sharedfolders/vboxvfs/vboxvfs$(TEMPLATE_VBOXLNX32GUESTR0_SYSSUFF) \
                 $(PATH_BIN)/additions/vboxadd-timesync \
                 $(PATH_BIN)/additions/vboxadd-xclient \

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -31 +31 @@
         r0drv/linux/alloc-r0drv-linux.o \
         r0drv/linux/semaphore-r0drv-linux.o \
+        RTErrnoConvertFromErr.o \
         divdi3.o \
         moddi3.o \

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -491 +491 @@
                 LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Vrc\n", dirop,
                          path->String.utf8, rc));
-
-                switch (rc) {
-                        case VERR_PATH_NOT_FOUND:
-                                err = -ENOENT;
-                                break;
-
-                        case VERR_DIR_NOT_EMPTY:
-                                err = -ENOTEMPTY;
-                                break;
-
-                        default:
-                                err = -EPROTO;
-                                LogFunc(("(%d): vboxCallRemove(%s) failed rc=%Vrc\n", dirop,
-                                         path->String.utf8, rc));
-                                break;
-                }
+                         err = -RTErrnoConvertFromErr(rc);
                 goto fail1;
         }
@@ -576 +561 @@
                         } else {
                                 LogFunc(("vboxCallRename failed rc=%Vrc\n", rc));
-                                switch (rc) {
-                                /** @todo we need a function to convert VBox error
-                                    codes back to Linux. */
-                                case VERR_ACCESS_DENIED:
-                                        err = -EACCES;
-                                        break;
-                                case VERR_DEV_IO_ERROR:
-                                        err = -EBUSY;
-                                        break;
-                                case VERR_INVALID_POINTER:
-                                        err = -EFAULT;
-                                        break;
-                                case VERR_FILE_NOT_FOUND:
-                                case VERR_PATH_NOT_FOUND:
-                                        err = -ENOENT;
-                                        break;
-                                default:
-                                        err = -EPROTO;
-                                }
+                                err = -RTErrnoConvertFromErr(err);
                         }
                         if (0 != err) {

trunk/src/VBox/Additions/linux/sharedfolders/files_vboxvfs

@@ -64 +64 @@
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/string.h=>r0drv/linux/string.h \
     ${PATH_ROOT}/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h=>r0drv/linux/the-linux-kernel.h \
+    ${PATH_ROOT}/src/VBox/Runtime/RTErrnoConvertFromErr.cpp=>RTErrnoConvertFromErr.c \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/Makefile.module=>Makefile \
     ${PATH_ROOT}/src/VBox/Additions/linux/sharedfolders/dirops.c=>dirops.c \

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -569 +569 @@
 
                         default:
-                                err = -EPROTO;
+                                err = -RTErrnoConvertFromErr(rc);
                                 LogFunc(("vboxCallDirInfo failed rc=%Vrc\n", rc));
                                 goto fail1;