Changeset 75457 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Nov 14, 2018 6:01:19 PM (6 years ago)

Author:

vboxsync

Message:

VBoxServiceAutoMount.cpp: Allow D:/unix/mnt/point. bugref:3544

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp (modified) (2 diffs)

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

@@ -1574 +1574 @@
 #if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
     /*
-     * Drive letter based:
+     * Drive letter based.  We only care about the first two characters
+     * and ignore the rest (see further down).
      */
     char chNextLetter = 'Z';
-    if (RT_C_IS_UPPER(pszMntPt[0]) && pszMntPt[1] == ':')
+    if (RT_C_IS_ALPHA(pszMntPt[0]) && pszMntPt[1] == ':')
         szActualMountPoint[0] = RT_C_TO_UPPER(pszMntPt[0]);
     else if (!fAutoMntPt)
@@ -1603 +1604 @@
      * Path based #1: Host specified mount point.
      */
+
+    /* Skip DOS drive letter if there is a UNIX mount point path following it: */
+    if (   pszMntPt[0] != '/'
+        && pszMntPt[0] != '\0'
+        && pszMntPt[1] == ':'
+        && pszMntPt[2] == '/')
+        pszMntPt += 2;
+
+    /* Try specified mount point if it starts with a UNIX slash: */
     int rc = VERR_ACCESS_DENIED;
     if (*pszMntPt == '/')