path

Timestamp:

Oct 10, 2013 6:27:32 PM (11 years ago)

Author:

vboxsync

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

89816

Message:

IPRT: Filename extension versus suffix cleanup, long overdue.

Location:

trunk/src/VBox/Runtime/common/path

Files:

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

-              r48935
+              r49039
 /*
  * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
+ *
  * This file is part of VirtualBox Open Source Edition (OSE), as
 …
+/**
+ * Finds the extension part of in a path.
+ *
+ * @returns Pointer to extension within pszPath.
+ * @returns NULL if no extension.
+ * @param   pszPath     Path to find extension in.
+ */
+RTDECL(char *) RTPathExt(const char *pszPath)
+RTDECL(char *) RTPathSuffix(const char *pszPath)
+{
     const char *psz = pszPath;
 …
             /* the end */
             case '\0':
                 if (pszExt)
+                if (pszExt && pszExt != pszPath && pszExt[1])
                     return (char *)(void *)pszExt;
                 return NULL;

-              r48935
+              r49039
 /*
  * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
+ *
  * This file is part of VirtualBox Open Source Edition (OSE), as
 …
+/**
+ * Checks if a path has an extension.
+ *
+ * @returns true if extension present.
+ * @returns false if no extension present.
+ * @param   pszPath     Path to check.
+ */
+RTDECL(bool) RTPathHasExt(const char *pszPath)
+RTDECL(bool) RTPathHasSuffix(const char *pszPath)
+{
     return RTPathExt(pszPath) != NULL;
+    return RTPathSuffix(pszPath) != NULL;
+}

-              r48935
+              r49039
 /*
  * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
+ *
  * This file is part of VirtualBox Open Source Edition (OSE), as
 …
+/**
+ * Strips the extension from a path.
+ *
+ * @param   pszPath     Path which extension should be stripped.
+ */
+RTDECL(void) RTPathStripExt(char *pszPath)
+RTDECL(void) RTPathStripSuffix(char *pszPath)
+{
+    char *pszDot = NULL;
+    for (;; pszPath++)
+    {
+        switch (*pszPath)
+        {
+            /* handle separators. */
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
+            case ':':
+            case '\\':
+#endif
+            case '/':
+                pszDot = NULL;
+                break;
+            case '.':
+                pszDot = pszPath;
+                break;
+            /* the end */
+            case '\0':
+                if (pszDot)
+                    *pszDot = '\0';
+                return;
+        }
+    }
+    /* will never get here */
+    char *pszSuffix = RTPathSuffix(pszPath);
+    if (pszSuffix)
+        *pszSuffix = '\0';
+}

Note: See TracChangeset for help on using the changeset viewer.