Changeset 85028 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jul 1, 2020 2:37:53 PM (5 years ago)

Author:

vboxsync

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

138929

Message:

DnD: DnDPathSanitizeFilename() -> DnDPathSanitize().

Location:

trunk/src/VBox/GuestHost/DragAndDrop

Files:

• DnDDroppedFiles.cpp (modified) (1 diff)
• DnDPath.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/DragAndDrop/DnDDroppedFiles.cpp

@@ -179 +179 @@
         }
 
-        rc = DnDPathSanitizeFilename(szTime, sizeof(szTime));
+        rc = DnDPathSanitize(szTime, sizeof(szTime));
         if (RT_FAILURE(rc))
             break;

trunk/src/VBox/GuestHost/DragAndDrop/DnDPath.cpp

@@ -31 +31 @@
 
 /**
- * Sanitizes the file name component so that unsupported characters
- * will be replaced by an underscore ("_").
+ * Sanitizes a path so that unsupported characters will be replaced by an underscore ("_").
  *
  * @return  IPRT status code.
@@ -38 +37 @@
  * @param   cbPath              Size (in bytes) of path to sanitize.
  */
-int DnDPathSanitizeFilename(char *pszPath, size_t cbPath)
+int DnDPathSanitize(char *pszPath, size_t cbPath)
 {
+    if (!pszPath) /* No path given? Bail out early. */
+        return VINF_SUCCESS;
+
+    AssertReturn(cbPath, VERR_INVALID_PARAMETER);
+
     int rc = VINF_SUCCESS;
 #ifdef RT_OS_WINDOWS
@@ -57 +61 @@
         '\0'
     };
-    char *pszFilename = RTPathFilename(pszPath);
-    if (pszFilename)
-    {
-        ssize_t cReplaced = RTStrPurgeComplementSet(pszFilename, s_uszValidRangePairs, '_' /* chReplacement */);
-        if (cReplaced < 0)
-            rc = VERR_INVALID_UTF8_ENCODING;
-    }
-    else
-        rc = VERR_INVALID_PARAMETER;
+
+    ssize_t cReplaced = RTStrPurgeComplementSet(pszPath, s_uszValidRangePairs, '_' /* chReplacement */);
+    if (cReplaced < 0)
+        rc = VERR_INVALID_UTF8_ENCODING;
 #else
     RT_NOREF2(pszPath, cbPath);