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

Timestamp:

Jul 10, 2009 4:35:40 PM (16 years ago)

Author:

vboxsync

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

49930

Message:

RTDirOpenFiltered: If trailing slash, then it has no pattern whatever the caller thinks.

File:

• trunk/src/VBox/Runtime/r3/dir.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/dir.cpp

@@ -701 +701 @@
      * Find the last component, i.e. where the filter criteria starts and the dir name ends.
      */
-    const char *pszFilter = enmFilter != RTDIRFILTER_NONE
-        ? RTPathFilename(pszPath)
-        : NULL;
+    const char *pszFilter;
+    if (enmFilter == RTDIRFILTER_NONE)
+        pszFilter = NULL;
+    else
+    {
+        pszFilter = RTPathFilename(pszPath);
+        if (!pszFilter) /* trailing slash => directory to read => no filter. */
+            enmFilter = RTDIRFILTER_NONE;
+    }
 
     /*
@@ -772 +778 @@
 
         RTDirClose(pDir);
-        rc = RTDirRemove(szAbsPath);    
+        rc = RTDirRemove(szAbsPath);
     }