Changeset 78112 in vbox

Timestamp:

Apr 11, 2019 2:16:53 PM (6 years ago)

Author:

vboxsync

Message:

Guest Control/Main: By default only delete empty directory structures when using IGuestSession::directoryRemoveRecursive(), e.g. the operation will abort if there are directories which are not empty. Will require new GAs >= r129975.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -3500 +3500 @@
         return setError(E_INVALIDARG, tr("No directory to remove recursively specified"));
 
-    uint32_t fFlags = DIRREMOVEREC_FLAG_NONE;
+    /* By default only delete empty directory structures, e.g. the operation will abort if there are
+     * directories which are not empty. */
+    uint32_t fFlags = DIRREMOVEREC_FLAG_RECURSIVE;
     if (aFlags.size())
     {
@@ -3511 +3513 @@
 
                 case DirectoryRemoveRecFlag_ContentAndDir:
-                    fFlags = DIRREMOVEREC_FLAG_RECURSIVE | DIRREMOVEREC_FLAG_CONTENT_AND_DIR;
+                    fFlags |= DIRREMOVEREC_FLAG_CONTENT_AND_DIR;
                     break;
 
                 case DirectoryRemoveRecFlag_ContentOnly:
-                    fFlags = DIRREMOVEREC_FLAG_RECURSIVE | DIRREMOVEREC_FLAG_CONTENT_ONLY;
+                    fFlags |= DIRREMOVEREC_FLAG_CONTENT_ONLY;
                     break;