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

Timestamp:

Jul 3, 2007 12:01:44 AM (17 years ago)

Author:

vboxsync

Message:

Runtime: Fixed the POSIX version of RTPathAbs() so that it now correctly works on systems that HAVE_DRIVE and HAVE_UNS (e.g. OS/2).

Location:

trunk/src/VBox/Runtime

Files:

• r3/posix/path-posix.cpp (modified) (13 diffs)
• testcase/tstPath.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

@@ -97 +97 @@
  * Cleans up a path specifier a little bit.
  * This includes removing duplicate slashes, uncessary single dots, and
- * trailing slashes.
+ * trailing slashes. Also, replaces all RTPATH_SLASH characters with '/'.
  *
  * @returns Number of bytes in the clean path.
@@ -124 +124 @@
     {
         char ch = *pszSrc++;
-        if (RTPATH_IS_SEP(ch))
-        {
-            *pszTrg++ = RTPATH_SLASH;
+        if (RTPATH_IS_SLASH(ch))
+        {
+            *pszTrg++ = '/';
             for (;;)
             {
                 do  ch = *pszSrc++;
-                while (RTPATH_IS_SEP(ch));
+                while (RTPATH_IS_SLASH(ch));
 
                 /* Remove '/./' and '/.'. */
-                if (ch != '.' || (*pszSrc && !RTPATH_IS_SEP(*pszSrc)))
+                if (ch != '.' || (*pszSrc && !RTPATH_IS_SLASH(*pszSrc)))
                     break;
             }
@@ -148 +148 @@
     int cch = pszTrg - pszPath;
     if (    cch > 1
-        &&  pszTrg[-1] == RTPATH_SLASH
+        &&  RTPATH_IS_SLASH(pszTrg[-1])
 #ifdef HAVE_DRIVE
-        &&  pszTrg[-2] != ':'
-#endif
-        &&  pszTrg[-2] != RTPATH_SLASH)
+        &&  !RTPATH_IS_VOLSEP(pszTrg[-2])
+#endif
+        &&  !RTPATH_IS_SLASH(pszTrg[-2]))
         pszPath[--cch] = '\0';
 
@@ -168 +168 @@
     if (RT_FAILURE(rc))
     {
-        LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath));
+        LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath,
+                 pszPath, pszAbsPath, cchAbsPath, rc));
         return rc;
     }
@@ -180 +181 @@
     if (!psz)
     {
-        if (errno == ENOENT || errno == ENOTDIR)
+        if (errno == ENOENT || errno == ENOTDIR
+#ifdef __OS2__
+            /// @todo realpath() returns EIO for non-existent UNC paths like
+            //  //server/share/subdir (i.e. when a subdir is specified within
+            //  a share). We should either fix realpath() in libc or remove
+            //  this todo.
+            || errno == EIO
+#endif
+            )
         {
             if (strlen(pszNativePath) <= PATH_MAX)
@@ -195 +204 @@
                 char *pszCur = szTmpSrc;
 
-                if (*pszCur == RTPATH_SLASH)
+#ifdef HAVE_DRIVE
+                if (pszCur[0] && RTPATH_IS_VOLSEP(pszCur[1]) && pszCur[2] == '/')
+                {
+                    psz = szTmpPath;
+                    cch = 2;
+                    pszCur += 3;
+                }
+#ifdef HAVE_UNC
+                else
+                if (pszCur[0] == '/' && pszCur[1] == '/')
+                {
+                    pszCur += 2;
+                    char *pszSlash = strchr(pszCur, '/');
+                    size_t cchElement = pszSlash ? pszSlash - pszCur : strlen(pszCur);
+                    if (cchElement && pszCur[cchElement])
+                    {
+                        psz = szTmpPath;
+                        cch = cchElement + 2;
+                        pszCur += cchElement + 1;
+                    }
+                    else
+                        /* we've got just "//server" or "//" */
+                        /// @todo (r=dmik) not 100% sure we should fail, but the
+                        //  above cases are just invalid (incomplete) paths,
+                        //  no matter that Win32 returns these paths as is.
+                        rc = VERR_INVALID_NAME;
+                }
+#endif
+#else
+                if (*pszCur == '/')
                 {
                     psz = szTmpPath;
                     pszCur++;
                 }
+#endif
                 else
                 {
@@ -206 +245 @@
                     AssertMsg(psz, ("Couldn't get cwd!\n"));
                     if (psz)
-                        cch = strlen(psz);
+                    {
+#ifdef HAVE_DRIVE
+                        if (*pszCur == '/')
+                        {
+                            cch = 2;
+                            pszCur++;
+                        }
+                        else
+#endif
+                            cch = strlen(psz);
+                    }
                     else
                         rc = RTErrConvertFromErrno(errno);
@@ -216 +265 @@
                     char szTmpPath2[PATH_MAX + 1];
 
+                    /* make sure strrchr() will work correctly */
+                    psz[cch] = '\0';
+
                     while (*pszCur)
                     {
-                        char *pszSlash = strchr(pszCur, RTPATH_SLASH);
+                        char *pszSlash = strchr(pszCur, '/');
                         size_t cchElement = pszSlash ? pszSlash - pszCur : strlen(pszCur);
                         if (cch + cchElement + 1 > PATH_MAX)
@@ -228 +280 @@
                         if (!strncmp(pszCur, "..", cchElement))
                         {
-                            char *pszLastSlash = strrchr(psz, RTPATH_SLASH);
+                            char *pszLastSlash = strrchr(psz, '/');
+#ifdef HAVE_UNC
+                            if (pszLastSlash && pszLastSlash > psz &&
+                                pszLastSlash[-1] != '/')
+#else
                             if (pszLastSlash)
+#endif
                             {
                                 cch = pszLastSlash - psz;
                                 psz[cch] = '\0';
                             }
-                            /* else: We've reached the root and the parent of the root is the root. */
+                            /* else: We've reached the root and the parent of
+                             * the root is the root. */
                         }
                         else
                         {
-                            psz[cch++] = RTPATH_SLASH;
+                            psz[cch++] = '/';
                             memcpy(psz + cch, pszCur, cchElement);
                             cch += cchElement;
@@ -256 +314 @@
                                 else
                                 {
-                                    if (errno != ENOENT && errno != ENOTDIR)
+                                    if (errno != ENOENT && errno != ENOTDIR
+#ifdef __OS2__
+                                        /// @todo see above
+                                        && errno != EIO
+#endif
+                                        )
                                     {
                                         rc = RTErrConvertFromErrno(errno);
@@ -274 +337 @@
                     }
 
-                    /* if the length is zero here, then we're at the root (Not true for half-posixs stuff such as libc!) */
+#ifdef HAVE_DRIVE
+                    /* check if we're at the root */
+                    if (cch == 2 && RTPATH_IS_VOLSEP(psz[1]))
+#else
+                    /* if the length is zero here, then we're at the root */
                     if (!cch)
+#endif
                     {
-                        psz[cch++] = RTPATH_SLASH;
+                        psz[cch++] = '/';
                         psz[cch] = '\0';
                     }
@@ -300 +368 @@
         if (RT_FAILURE(rc))
         {
-            LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath));
+            LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath,
+                     pszPath, pszAbsPath, cchAbsPath, rc));
             return rc;
         }
+
+        /* replace '/' back with native RTPATH_SLASH */
+        psz = pszUtf8AbsPath;
+        for (; *psz; psz++)
+            if (*psz == '/')
+                *psz = RTPATH_SLASH;
 
         unsigned cch = strlen(pszUtf8AbsPath) + 1;
@@ -312 +387 @@
     }
 
-    LogFlow(("RTPathAbs(%p:{%s}, %p:{%s}, %d): returns %Rrc\n", pszPath, pszPath,
-             pszAbsPath, RT_SUCCESS(rc) ? pszAbsPath : "<failed>", cchAbsPath));
+    LogFlow(("RTPathAbs(%p:{%s}, %p:{%s}, %d): returns %Rrc\n", pszPath,
+             pszPath, pszAbsPath, RT_SUCCESS(rc) ? pszAbsPath : "<failed>",
+             cchAbsPath, rc));
     return rc;
 }

trunk/src/VBox/Runtime/testcase/tstPath.cpp

@@ -69 +69 @@
         NULL,                           "/absolute/../../path",
         NULL,                           "relative/../dir\\.\\.\\.\\file.txt",
+        NULL,                           "\\",
         "relative_base/dir\\",          "\\from_root",
         "relative_base/dir/",           "relative_also",
 #if defined (__OS2__) || defined (__WIN__)
+        NULL,                           "C:\\",
+        "C:\\",                         "..",
         "C:\\temp",                     "..",
         "C:\\VirtualBox/Machines",      "..\\VirtualBox.xml",
         "C:\\MustDie",                  "\\from_root/dir/..",
         "C:\\temp",                     "D:\\data",
-        NULL,                           "\\\\server\\../share", // -- GetFullPathName doesn't remove .. here
+        NULL,                           "\\\\server\\../share", // -- on Win32, GetFullPathName doesn't remove .. here
+        /* the three below use cases should fail with VERR_INVALID_NAME */
+        //NULL,                           "\\\\server",
+        //NULL,                           "\\\\",
+        //NULL,                           "\\\\\\something",
         "\\\\server\\share_as_base",    "/from_root",
         "\\\\just_server",              "/from_root",
         "\\\\server\\share_as_base",    "relative\\data",
         "base",                         "\\\\?\\UNC\\relative/edwef/..",
-        // this is not (and I guess should not be) supported
-        ///@todo "\\\\?\\UNC\\base",             "/from_root", - r=bird: negative tests shouldn't fail the testcase!
+        "base",                         "\\\\?\\UNC\\relative/edwef/..",
+        /* this is not (and I guess should not be) supported, should fail */
+        ///@todo "\\\\?\\UNC\\base",             "/from_root",
 #else
         "\\temp",                       "..",