Changeset 79326 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 25, 2019 2:19:35 PM (5 years ago)

Author:

vboxsync

Message:

VBoxService: Made new sub-dir only deletion code work like RTDirRemoveRecursive and not fail if the specified directory does not exist. bugref:9320

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -126 +126 @@
  *
  * @returns IPRT status code.
- * @param   pszDir              The directory buffer.  Contains the abs path to the
- *                              directory to recurse into.  Trailing slash.
+ * @param   pszDir              The directory buffer, RTPATH_MAX in length.
+ *                              Contains the abs path to the directory to
+ *                              recurse into. Trailing slash.
  * @param   cchDir              The length of the directory we're recursing into,
  *                              including the trailing slash.
@@ -137 +138 @@
     int rc = RTDirOpen(&hDir, pszDir);
     if (RT_FAILURE(rc))
+    {
+        /* Ignore non-existing directories like RTDirRemoveRecursive does: */
+        if (rc == VERR_FILE_NOT_FOUND || rc == VERR_PATH_NOT_FOUND)
+            return VINF_SUCCESS;
         return rc;
-
-    while (RT_SUCCESS(rc = RTDirRead(hDir, pDirEntry, NULL)))
-    {
+    }
+
+    for (;;)
+    {
+        rc = RTDirRead(hDir, pDirEntry, NULL);
+        if (RT_FAILURE(rc))
+        {
+            if (rc == VERR_NO_MORE_FILES)
+                rc = VINF_SUCCESS;
+            break;
+        }
+
         if (!RTDirEntryIsStdDotLink(pDirEntry))
         {
@@ -152 +166 @@
             }
 
-            /* Switch on type. */
+            /* Make sure we've got the entry type. */
             if (pDirEntry->enmType == RTDIRENTRYTYPE_UNKNOWN)
                 RTDirQueryUnknownType(pszDir, false /*fFollowSymlinks*/, &pDirEntry->enmType);
-            switch (pDirEntry->enmType)
+
+            /* Recurse into subdirs and remove them: */
+            if (pDirEntry->enmType == RTDIRENTRYTYPE_DIRECTORY)
             {
-                case RTDIRENTRYTYPE_DIRECTORY:
+                size_t cchSubDir    = cchDir + pDirEntry->cbName;
+                pszDir[cchSubDir++] = RTPATH_SLASH;
+                pszDir[cchSubDir]   = '\0';
+                rc = vgsvcGstCtrlSessionHandleDirRemoveSub(pszDir, cchSubDir, pDirEntry);
+                if (RT_SUCCESS(rc))
                 {
-                    size_t cchSubDir    = cchDir + pDirEntry->cbName;
-                    pszDir[cchSubDir++] = RTPATH_SLASH;
-                    pszDir[cchSubDir]   = '\0';
-                    rc = vgsvcGstCtrlSessionHandleDirRemoveSub(pszDir, cchSubDir, pDirEntry);
-                    if (RT_SUCCESS(rc))
-                    {
-                        pszDir[cchSubDir] = '\0';
-                        rc = RTDirRemove(pszDir);
-                    }
-                    break;
+                    pszDir[cchSubDir] = '\0';
+                    rc = RTDirRemove(pszDir);
+                    if (RT_FAILURE(rc))
+                        break;
                 }
-
-                default:
-                    rc = VERR_DIR_NOT_EMPTY;
+                else
                     break;
             }
-            if (RT_FAILURE(rc))
-               break;
-        }
-    }
-    if (rc == VERR_NO_MORE_FILES)
-        rc = VINF_SUCCESS;
+            /* Not a subdirectory - fail: */
+            else
+            {
+                rc = VERR_DIR_NOT_EMPTY;
+                break;
+            }
+        }
+    }
+
     RTDirClose(hDir);
     return rc;
@@ -206 +221 @@
             if (fFlags & DIRREMOVEREC_FLAG_RECURSIVE)
             {
-                if (   fFlags & DIRREMOVEREC_FLAG_CONTENT_AND_DIR
-                    || fFlags & DIRREMOVEREC_FLAG_CONTENT_ONLY)
+                if (fFlags & (DIRREMOVEREC_FLAG_CONTENT_AND_DIR | DIRREMOVEREC_FLAG_CONTENT_ONLY))
                 {
-                    uint32_t fFlagsRemRec = 0;
-                    if (fFlags & DIRREMOVEREC_FLAG_CONTENT_AND_DIR)
-                        fFlagsRemRec |= RTDIRRMREC_F_CONTENT_AND_DIR;
-                    else if (fFlags & DIRREMOVEREC_FLAG_CONTENT_ONLY)
-                        fFlagsRemRec |= RTDIRRMREC_F_CONTENT_ONLY;
+                    uint32_t fFlagsRemRec = fFlags & DIRREMOVEREC_FLAG_CONTENT_AND_DIR
+                                          ? RTDIRRMREC_F_CONTENT_AND_DIR : RTDIRRMREC_F_CONTENT_ONLY;
                     rc = RTDirRemoveRecursive(szDir, fFlagsRemRec);
                 }