Changeset 64634 in vbox for trunk/src/VBox/Runtime

Timestamp:

Nov 10, 2016 3:11:20 PM (8 years ago)

Author:

vboxsync

Message:

RTPathAbs-generic.cpp: Have to remove '.' too, like the it says on the package, or NT fails to parse the resulting path (RTDir*, RTFsQuery*,++)

File:

• trunk/src/VBox/Runtime/generic/RTPathAbs-generic.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/generic/RTPathAbs-generic.cpp

@@ -291 +291 @@
     for (;;)
     {
-        if (   pszCur[0] == '.'
+        char const chFirst = pszCur[0];
+        if (   chFirst == '.'
             && pszCur[1] == '.'
             && (!pszCur[2] || pszCur[2] == RTPATH_SLASH))
@@ -316 +317 @@
             pszCur = pszPrev - 1;
         }
+        else if (   chFirst == '.'
+                 && (!pszCur[1] || pszCur[1] == RTPATH_SLASH))
+        {
+            /* remove unnecessary '.' */
+            if (!pszCur[1])
+            {
+                if (pszCur != pszTop)
+                    pszCur[-1] = '\0';
+                else
+                    *pszCur = '\0';
+                break;
+            }
+            memmove(pszCur, pszCur + 2, strlen(pszCur + 2) + 1);
+            continue;
+        }
         else
         {