Changeset 75469 in vbox for trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp

Timestamp:

Nov 14, 2018 8:53:20 PM (7 years ago)

Author:

vboxsync

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

126624

Message:

VBoxService,VBoxControl: OS/2 build fixes.

File:

• trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp (modified) (4 diffs)

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

@@ -23 +23 @@
 #include <iprt/cpp/autores.h>
 #include <iprt/buildconfig.h>
+#include <iprt/ctype.h>
+#include <iprt/err.h>
 #include <iprt/getopt.h>
 #include <iprt/initterm.h>
@@ -43 +45 @@
 # include <VBox/shflsvc.h>
 # ifdef RT_OS_OS2
+#  define OS2EMX_PLAIN_CHAR
 #  define INCL_ERRORS
 #  define INCL_DOSFILEMGR
@@ -1704 +1707 @@
         return VBoxControlSyntaxError("sharedfolders use: not a drive letter: %s\n", pszDrive);
 
+    static const char s_szTag[] = "VBoxControl";
+    char        szzNameAndTag[256];
     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)
+    if (cchName + 1 + sizeof(s_szTag) >= sizeof(szzNameAndTag))
         return VBoxControlSyntaxError("sharedfolders use: shared folder name is too long! (%s)\n", pszName);
 
@@ -1714 +1719 @@
      * Do the attaching.
      */
-    static const char s_szTag[] = "VBoxControl";
-    char    szzNameAndTag[256];
-    size_t  cchName = strlen(pEntry->pszName);
-    memcpy(szzNameAndTag, pEntry->pszName, cchName);
+    memcpy(szzNameAndTag, 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)
+    APIRET rcOs2 = DosFSAttach(pszDrive, "VBOXSF", szzNameAndTag, cchName + 1 + sizeof(s_szTag), FS_ATTACH);
+    if (rcOs2 == NO_ERROR)
         return RTEXITCODE_SUCCESS;
     return VBoxControlError("DosFSAttach/FS_ATTACH failed to attach '%s' to '%s': %u\n", pszName, pszDrive, rcOs2);