Changeset 45391 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Apr 7, 2013 5:15:29 PM (12 years ago)

Author:

vboxsync

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

84816

Message:

IPRT: Changed the RTPATHPARSE_FLAGS_ into generic ones as they will be shared with RTPathSplit*. Introduced a new character called RTPATH_STYLE with can have two values (currently) RTPATH_STR_F_STYLE_DOS or RTPATH_STR_F_STYLE_UNIX. Some other minor adjustments.

Location:

trunk/src/VBox/Runtime/common/path

Files:

• RTPathParse.cpp (modified) (1 diff)
• RTPathParse.cpp.h (modified) (6 diffs)
• rtpath-expand-template.cpp.h (modified) (5 diffs)

trunk/src/VBox/Runtime/common/path/RTPathParse.cpp

@@ -50 +50 @@
     AssertPtrReturn(pszPath, VERR_INVALID_POINTER);
     AssertReturn(*pszPath, VERR_PATH_ZERO_LENGTH);
-    AssertReturn(!(fFlags & ~RTPATHPARSE_FLAGS_VALID_MASK), VERR_INVALID_FLAGS);
+    AssertReturn(RTPATH_STR_F_IS_VALID(fFlags, 0), VERR_INVALID_FLAGS);
 
     /*
      * Invoke the worker for the selected path style.
      */
-    switch (fFlags & RTPATHPARSE_FLAGS_STYLE_MASK)
+    switch (fFlags & RTPATH_STR_F_STYLE_MASK)
     {
 #if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
-        case RTPATHPARSE_FLAGS_STYLE_HOST:
+        case RTPATH_STR_F_STYLE_HOST:
 #endif
-        case RTPATHPARSE_FLAGS_STYLE_DOS:
+        case RTPATH_STR_F_STYLE_DOS:
             return rtPathParseStyleDos(pszPath, pParsed, cbParsed, fFlags);
 
 #if !defined(RT_OS_OS2) && !defined(RT_OS_WINDOWS)
-        case RTPATHPARSE_FLAGS_STYLE_HOST:
+        case RTPATH_STR_F_STYLE_HOST:
 #endif
-        case RTPATHPARSE_FLAGS_STYLE_UNIX:
+        case RTPATH_STR_F_STYLE_UNIX:
             return rtPathParseStyleUnix(pszPath, pParsed, cbParsed, fFlags);
 
         default:
-            AssertFailedReturn(VERR_INVALID_FLAGS);
+            AssertFailedReturn(VERR_INVALID_FLAGS); /* impossible */
     }
 }

trunk/src/VBox/Runtime/common/path/RTPathParse.cpp.h

@@ -48 +48 @@
     if (RTPATH_IS_SLASH(pszPath[0]))
     {
-        if (fFlags & RTPATHPARSE_FLAGS_NO_START)
+        if (fFlags & RTPATH_STR_F_NO_START)
         {
             offCur = 1;
@@ -58 +58 @@
             cchPath = 0;
         }
-#ifdef RTPATH_STYLE_DOS
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
         else if (   RTPATH_IS_SLASH(pszPath[1])
                  && !RTPATH_IS_SLASH(pszPath[2])
@@ -84 +84 @@
         else
         {
-#ifdef RTPATH_STYLE_DOS
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
             fProps = RTPATH_PROP_ROOT_SLASH | RTPATH_PROP_RELATIVE;
 #else
@@ -92 +92 @@
         }
     }
-#ifdef RTPATH_STYLE_DOS
+#if RTPATH_STYLE == RTPATH_STR_F_STYLE_DOS
     else if (RT_C_IS_ALPHA(pszPath[0]) && pszPath[1] == ':')
     {
@@ -115 +115 @@
 
     /*  Add it to the component array . */
-    if (offCur && !(fFlags & RTPATHPARSE_FLAGS_NO_START))
+    if (offCur && !(fFlags & RTPATH_STR_F_NO_START))
     {
         cchPath = offCur;
@@ -192 +192 @@
                 if (ch)
                 {
-                    if (!(fFlags & RTPATHPARSE_FLAGS_NO_END))
+                    if (!(fFlags & RTPATH_STR_F_NO_END))
                         fProps |= RTPATH_PROP_DIR_SLASH; /* (not counted) */
                     else
                         fProps |= RTPATH_PROP_EXTRA_SLASHES;
                 }
-                else if (!(fFlags & RTPATHPARSE_FLAGS_NO_END))
+                else if (!(fFlags & RTPATH_STR_F_NO_END))
                 {
                     fProps |= RTPATH_PROP_FILENAME;

trunk/src/VBox/Runtime/common/path/rtpath-expand-template.cpp.h

@@ -26 +26 @@
  */
 
+#undef  RTPATH_DELIMITER
 
 /*
- * The following should move to a helper header!
+ * DOS style
  */
-#undef  RTPATH_DELIMITER
-
-/* DOS style */
-#undef  RTPATH_STYLE_UNIX
-#undef  RTPATH_STYLE_DOS
+#undef  RTPATH_STYLE
+#undef  RTPATH_SLASH
 #undef  RTPATH_SLASH_STR
 #undef  RTPATH_IS_SLASH
@@ -40 +38 @@
 #undef  RTPATH_STYLE_FN
 
-#define RTPATH_STYLE_DOS
+#define RTPATH_STYLE            RTPATH_STR_F_STYLE_DOS
+#define RTPATH_SLASH            '\\'
 #define RTPATH_SLASH_STR        "\\"
 #define RTPATH_IS_SLASH(a_ch)   ( (a_ch) == '\\' || (a_ch) == '/' )
@@ -47 +46 @@
 #include RTPATH_TEMPLATE_CPP_H
 
-/* Unix style. */
-#undef  RTPATH_STYLE_UNIX
-#undef  RTPATH_STYLE_DOS
+/*
+ * Unix style.
+ */
+#undef  RTPATH_STYLE
+#undef  RTPATH_SLASH
 #undef  RTPATH_SLASH_STR
 #undef  RTPATH_IS_SLASH
@@ -55 +56 @@
 #undef  RTPATH_STYLE_FN
 
-#define RTPATH_STYLE_UNIX
+#define RTPATH_STYLE            RTPATH_STR_F_STYLE_UNIX
+#define RTPATH_SLASH            '/'
 #define RTPATH_SLASH_STR        "/"
 #define RTPATH_IS_SLASH(a_ch)   ( (a_ch) == '/' )
@@ -62 +64 @@
 #include RTPATH_TEMPLATE_CPP_H
 
-/* Restore original style. */
+/*
+ * Clean up and restore the host style.
+ */
 #undef RTPATH_STYLE_FN
 #if defined(RT_OS_OS2) || defined(RT_OS_WINDOWS)
-# undef  RTPATH_STYLE_UNIX
-# undef  RTPATH_STYLE_DOS
+# undef  RTPATH_STYLE
 # undef  RTPATH_SLASH_STR
 # undef  RTPATH_IS_SLASH
 # undef  RTPATH_IS_VOLSEP
-# define RTPATH_SLASH_STR        "\\"
-# define RTPATH_IS_SLASH(a_ch)   ( (a_ch) == '\\' || (a_ch) == '/' )
-# define RTPATH_IS_VOLSEP(a_ch)  ( (a_ch) == ':' )
+# define RTPATH_STYLE           RTPATH_STR_F_STYLE_DOS
+# define RTPATH_SLASH           '\\'
+# define RTPATH_SLASH_STR       "\\"
+# define RTPATH_IS_SLASH(a_ch)  ( (a_ch) == '\\' || (a_ch) == '/' )
+# define RTPATH_IS_VOLSEP(a_ch) ( (a_ch) == ':' )
 #endif