Changeset 75467 in vbox

Timestamp:

Nov 14, 2018 8:45:16 PM (6 years ago)

Author:

vboxsync

Message:

VBoxControl,VBoxService: Some OS/2 bits.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxControl/VBoxControl.cpp (modified) (10 diffs)
• VBoxService/VBoxServiceAutoMount.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

@@ -39 +39 @@
 #ifdef VBOX_WITH_GUEST_PROPS
 # include <VBox/HostServices/GuestPropertySvc.h>
+#endif
+#ifdef VBOX_WITH_SHARED_FOLDERS
+# include <VBox/shflsvc.h>
+# ifdef RT_OS_OS2
+#  define INCL_ERRORS
+#  define INCL_DOSFILEMGR
+#  include <os2emx.h>
+# endif
 #endif
 #ifdef VBOX_WITH_DPC_LATENCY_CHECKER
@@ -146 +154 @@
 #endif
 #ifdef VBOX_WITH_SHARED_FOLDERS
-    if (eWhich  == GUEST_SHAREDFOLDERS || eWhich == USAGE_ALL)
-    {
-        doUsage("list [-automount]", g_pszProgName, "sharedfolder");
+    if (eWhich == GUEST_SHAREDFOLDERS || eWhich == USAGE_ALL)
+    {
+        doUsage("list [--automount]", g_pszProgName, "sharedfolder");
+# ifdef RT_OS_OS2
+        doUsage("use <drive> <folder>", g_pszProgName, "sharedfolder");
+        doUsage("unuse <drive>", g_pszProgName, "sharedfolder");
+# endif
     }
 #endif
@@ -235 +247 @@
     RTMsgErrorV(pszFormat, va);
     va_end(va);
-    return RTEXITCODE_FAILURE;
+    return RTEXITCODE_SYNTAX;
 }
 
@@ -1591 +1603 @@
     return RTEXITCODE_FAILURE;
 }
+
 #endif
-
 #ifdef VBOX_WITH_SHARED_FOLDERS
+
 /**
  * Lists the Shared Folders provided by the host.
@@ -1603 +1616 @@
     if (argc == 1)
     {
-        if (   !strcmp(argv[0], "-automount")
-            || !strcmp(argv[0], "--automount"))
+        if (!strcmp(argv[0], "--automount"))
             fOnlyShowAutoMount = true;
         else
@@ -1614 +1626 @@
     {
         usage(GUEST_SHAREDFOLDERS);
-        return RTEXITCODE_FAILURE;
+        return RTEXITCODE_SYNTAX;
     }
 
@@ -1636 +1648 @@
             {
                 char *pszName;
-                rc = VbglR3SharedFolderGetName(u32ClientId, paMappings[i].u32Root, &pszName);
+                char *pszMntPt;
+                uint64_t fFlags;
+                uint32_t uRootIdVer;
+                rc = VbglR3SharedFolderQueryFolderInfo(u32ClientId, paMappings[i].u32Root, 0,
+                                                       &pszName, &pszMntPt, &fFlags, &uRootIdVer);
                 if (RT_SUCCESS(rc))
                 {
-                    RTPrintf("%02u - %s\n", i + 1, pszName);
+                    RTPrintf("%02u - %s [idRoot=%u", i + 1, pszName, paMappings[i].u32Root);
+                    if (fFlags & SHFL_MIF_WRITABLE)
+                        RTPrintf(" writable");
+                    else
+                        RTPrintf(" readonly");
+                    if (fFlags & SHFL_MIF_AUTO_MOUNT)
+                        RTPrintf(" auto-mount");
+                    if (fFlags & SHFL_MIF_SYMLINK_CREATION)
+                        RTPrintf(" create-symlink");
+                    if (fFlags & SHFL_MIF_HOST_ICASE)
+                        RTPrintf(" host-icase");
+                    if (fFlags & SHFL_MIF_GUEST_ICASE)
+                        RTPrintf(" guest-icase");
+                    if (*pszMntPt)
+                        RTPrintf(" mnt-pt=%s", pszMntPt);
                     RTStrFree(pszName);
+                    RTStrFree(pszMntPt);
                 }
                 else
@@ -1657 +1688 @@
 }
 
+# ifdef RT_OS_OS2
+/**
+ * Attaches a shared folder to a drive letter.
+ */
+static RTEXITCODE sharedFolders_use(int argc, char **argv)
+{
+    /*
+     * Takes a drive letter and a share name as arguments.
+     */
+    if (argc != 2)
+        return VBoxControlSyntaxError("sharedfolders use: expected a drive letter and a shared folder name\n");
+
+    const char *pszDrive  = argv[0];
+    if (!RT_C_IS_ALPHA(pszDrive[0]) || pszDrive[1] != ':' || pszDrive[2] != '\0')
+        return VBoxControlSyntaxError("sharedfolders use: not a drive letter: %s\n", pszDrive);
+
+    const char *pszName   = argv[1];
+    size_t cchName = strlen(pszName);
+    if (cchName < 1)
+        return VBoxControlSyntaxError("sharedfolders use: shared folder name cannot be empty!\n");
+    if (cchName > 128)
+        return VBoxControlSyntaxError("sharedfolders use: shared folder name is too long! (%s)\n", pszName);
+
+    /*
+     * Do the attaching.
+     */
+    static const char s_szTag[] = "VBoxControl";
+    char    szzNameAndTag[256];
+    size_t  cchName = strlen(pEntry->pszName);
+    memcpy(szzNameAndTag, pEntry->pszName, cchName);
+    szzNameAndTag[cchName] = '\0';
+    memcpy(&szzNameAndTag[cchName + 1], s_szTag, sizeof(s_szTag));
+
+    APIRET rc = DosFSAttach(pEntry->pszActualMountPoint, "VBOXSF", szzNameAndTag, cchName + 1 + sizeof(s_szTag), FS_ATTACH);
+    if (rc == NO_ERROR)
+        return RTEXITCODE_SUCCESS;
+    return VBoxControlError("DosFSAttach/FS_ATTACH failed to attach '%s' to '%s': %u\n", pszName, pszDrive, rcOs2);
+}
+
+/**
+ * Detaches a shared folder from a drive letter.
+ */
+static RTEXITCODE sharedFolders_unuse(int argc, char **argv)
+{
+    /*
+     * Only takes a drive letter as argument.
+     */
+    if (argc != 1)
+        return VBoxControlSyntaxError("sharedfolders unuse: expected drive letter\n");
+    const char *pszDrive = argv[0];
+    if (!RT_C_IS_ALPHA(pszDrive[0]) || pszDrive[1] != ':' || pszDrive[2] != '\0')
+        return VBoxControlSyntaxError("sharedfolders unuse: not a drive letter: %s\n", pszDrive);
+
+    /*
+     * Do the detaching.
+     */
+    APIRET rcOs2 = DosFSAttach(pszDrive, "VBOXSF", NULL, 0, FS_DETACH);
+    if (rcOs2 == NO_ERROR)
+        return RTEXITCODE_SUCCESS;
+    return VBoxControlError("DosFSAttach/FS_DETACH failed on '%s': %u\n", pszDrive, rcOs2);
+}
+
+# endif /* RT_OS_OS2 */
+
+
 /**
  * Handles Shared Folders control.
@@ -1673 +1769 @@
     if (!strcmp(argv[0], "list"))
         return listSharedFolders(argc - 1, argv + 1);
-    /* else */
+# ifdef RT_OS_OS2
+    if (!strcmp(argv[0], "use"))
+        return sharedFolders_use(argc - 1, argv + 1);
+    if (!strcmp(argv[0], "unuse"))
+        return sharedFolders_unuse(argc - 1, argv + 1);
+# endif
+
     usage(GUEST_SHAREDFOLDERS);
     return RTEXITCODE_FAILURE;
 }
+
 #endif
-
 #if !defined(VBOX_CONTROL_TEST)
+
 /**
  * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: writecoredump}
@@ -1698 +1801 @@
     }
 }
+
 #endif
-
 #ifdef VBOX_WITH_DPC_LATENCY_CHECKER
+
 /**
  * @callback_method_impl{FNVBOXCTRLCMDHANDLER, Command: help}

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

@@ -52 +52 @@
 #ifdef RT_OS_WINDOWS
 #elif defined(RT_OS_OS2)
+# define INCL_DOSFILEMGR
+# define INCL_ERRORS
+# include <os2emx.h>
 #else
 # include <errno.h>
@@ -1417 +1420 @@
         memcpy(&szzNameAndTag[cchName + 1], g_szTag, sizeof(g_szTag));
 
-        APIRET rc = DosFSAttach(pEntry->pszActualMountPoint, "VBOXSF", szzNameAndTag, cchName + 1 + sizeof(g_szzTag), FS_ATTACH);
+        APIRET rc = DosFSAttach(pEntry->pszActualMountPoint, "VBOXSF", szzNameAndTag, cchName + 1 + sizeof(g_szTag), FS_ATTACH);
         if (rc == NO_ERROR)
         {