Changeset 52944 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Oct 5, 2014 4:37:10 AM (10 years ago)

Author:

vboxsync

Message:

IPRT: Separated out RTPathAbs from the posix, fixing it up for windows + OS/2, and made it generic. Also added some NT path routines.

File:

• trunk/src/VBox/Runtime/r3/posix/path-posix.cpp (modified) (1 diff)

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

@@ -76 +76 @@
     LogFlow(("RTPathReal(%p:{%s}, %p:{%s}, %u): returns %Rrc\n", pszPath, pszPath,
              pszRealPath, RT_SUCCESS(rc) ? pszRealPath : "<failed>",  cchRealPath, rc));
-    return rc;
-}
-
-
-/**
- * Cleans up a path specifier a little bit.
- * This includes removing duplicate slashes, unnecessary single dots, and
- * trailing slashes. Also, replaces all RTPATH_SLASH characters with '/'.
- *
- * @returns Number of bytes in the clean path.
- * @param   pszPath     The path to cleanup.
- */
-static int fsCleanPath(char *pszPath)
-{
-    /*
-     * Change to '/' and remove duplicates.
-     */
-    char   *pszSrc = pszPath;
-    char   *pszTrg = pszPath;
-#ifdef HAVE_UNC
-    int     fUnc = 0;
-    if (    RTPATH_IS_SLASH(pszPath[0])
-        &&  RTPATH_IS_SLASH(pszPath[1]))
-    {   /* Skip first slash in a unc path. */
-        pszSrc++;
-        *pszTrg++ = '/';
-        fUnc = 1;
-    }
-#endif
-
-    for (;;)
-    {
-        char ch = *pszSrc++;
-        if (RTPATH_IS_SLASH(ch))
-        {
-            *pszTrg++ = '/';
-            for (;;)
-            {
-                do  ch = *pszSrc++;
-                while (RTPATH_IS_SLASH(ch));
-
-                /* Remove '/./' and '/.'. */
-                if (ch != '.' || (*pszSrc && !RTPATH_IS_SLASH(*pszSrc)))
-                    break;
-            }
-        }
-        *pszTrg = ch;
-        if (!ch)
-            break;
-        pszTrg++;
-    }
-
-    /*
-     * Remove trailing slash if the path may be pointing to a directory.
-     */
-    int cch = pszTrg - pszPath;
-    if (    cch > 1
-        &&  RTPATH_IS_SLASH(pszTrg[-1])
-#ifdef HAVE_DRIVE
-        &&  !RTPATH_IS_VOLSEP(pszTrg[-2])
-#endif
-        &&  !RTPATH_IS_SLASH(pszTrg[-2]))
-        pszPath[--cch] = '\0';
-
-    return cch;
-}
-
-
-RTDECL(int) RTPathAbs(const char *pszPath, char *pszAbsPath, size_t cchAbsPath)
-{
-    int rc;
-
-    /*
-     * Validation.
-     */
-    AssertPtr(pszAbsPath);
-    AssertPtr(pszPath);
-    if (RT_UNLIKELY(!*pszPath))
-        return VERR_INVALID_PARAMETER;
-
-    /*
-     * Make a clean working copy of the input.
-     */
-    size_t cchPath = strlen(pszPath);
-    if (cchPath > PATH_MAX)
-    {
-        LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath, VERR_FILENAME_TOO_LONG));
-        return VERR_FILENAME_TOO_LONG;
-    }
-
-    char szTmpPath[PATH_MAX + 1];
-    memcpy(szTmpPath, pszPath, cchPath + 1);
-    size_t cchTmpPath = fsCleanPath(szTmpPath);
-
-    /*
-     * Handle "." specially (fsCleanPath does).
-     */
-    if (szTmpPath[0] == '.' && !szTmpPath[1])
-        return RTPathGetCurrent(pszAbsPath, cchAbsPath);
-
-    /*
-     * Do we have a root slash?
-     */
-    char *pszCur = szTmpPath;
-#ifdef HAVE_DRIVE
-    if (pszCur[0] && RTPATH_IS_VOLSEP(pszCur[1]) && pszCur[2] == '/')
-        pszCur += 3;
-# ifdef HAVE_UNC
-    else if (pszCur[0] == '/' && pszCur[1] == '/')
-        pszCur += 2;
-# endif
-#else  /* !HAVE_DRIVE */
-    if (pszCur[0] == '/')
-        pszCur += 1;
-#endif /* !HAVE_DRIVE */
-    else
-    {
-        /*
-         * No, prepend the current directory to the relative path.
-         */
-        char szCurDir[RTPATH_MAX];
-        rc = RTPathGetCurrent(szCurDir, sizeof(szCurDir));
-        AssertRCReturn(rc, rc);
-
-        size_t cchCurDir = fsCleanPath(szCurDir); /* paranoia */
-        if (cchCurDir + cchTmpPath + 1 > PATH_MAX)
-        {
-            LogFlow(("RTPathAbs(%p:{%s}, %p, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath, cchAbsPath, VERR_FILENAME_TOO_LONG));
-            return VERR_FILENAME_TOO_LONG;
-        }
-
-        memmove(szTmpPath + cchCurDir + 1, szTmpPath, cchTmpPath + 1);
-        memcpy(szTmpPath, szCurDir, cchCurDir);
-        szTmpPath[cchCurDir] = '/';
-
-
-#ifdef HAVE_DRIVE
-        if (pszCur[0] && RTPATH_IS_VOLSEP(pszCur[1]) && pszCur[2] == '/')
-            pszCur += 3;
-# ifdef HAVE_UNC
-        else if (pszCur[0] == '/' && pszCur[1] == '/')
-            pszCur += 2;
-# endif
-#else
-        if (pszCur[0] == '/')
-            pszCur += 1;
-#endif
-        else
-            AssertMsgFailedReturn(("pszCur=%s\n", pszCur), VERR_INTERNAL_ERROR);
-    }
-
-    char *pszTop = pszCur;
-
-    /*
-     * Get rid of double dot path components by evaluating them.
-     */
-    for (;;)
-    {
-        if (   pszCur[0] == '.'
-            && pszCur[1] == '.'
-            && (!pszCur[2] || pszCur[2] == '/'))
-        {
-            /* rewind to the previous component if any */
-            char *pszPrev = pszCur - 1;
-            if (pszPrev > pszTop)
-                while (*--pszPrev != '/')
-                    ;
-
-            AssertMsg(*pszPrev == '/', ("szTmpPath={%s}, pszPrev=+%u\n", szTmpPath, pszPrev - szTmpPath));
-            memmove(pszPrev, pszCur + 2, strlen(pszCur + 2) + 1);
-
-            pszCur = pszPrev;
-        }
-        else
-        {
-            /* advance to end of component. */
-            while (*pszCur && *pszCur != '/')
-                pszCur++;
-        }
-
-        if (!*pszCur)
-            break;
-
-        /* skip the slash */
-        ++pszCur;
-    }
-
-    if (pszCur < pszTop)
-    {
-        /*
-         * We overwrote the root slash with '\0', restore it.
-         */
-        *pszCur++ = '/';
-        *pszCur = '\0';
-    }
-    else if (pszCur > pszTop && pszCur[-1] == '/')
-    {
-        /*
-         * Extra trailing slash in a non-root path, remove it.
-         * (A bit questionable...)
-         */
-        *--pszCur = '\0';
-    }
-
-    /*
-     * Copy the result to the user buffer.
-     */
-    cchTmpPath = pszCur - szTmpPath;
-    if (cchTmpPath < cchAbsPath)
-    {
-        memcpy(pszAbsPath, szTmpPath, cchTmpPath + 1);
-        rc = VINF_SUCCESS;
-    }
-    else
-        rc = VERR_BUFFER_OVERFLOW;
-
-    LogFlow(("RTPathAbs(%p:{%s}, %p:{%s}, %d): returns %Rrc\n", pszPath, pszPath, pszAbsPath,
-             RT_SUCCESS(rc) ? pszAbsPath : "<failed>", cchAbsPath, rc));
     return rc;
 }