Changeset 89915 in vbox

Timestamp:

Jun 25, 2021 3:42:07 PM (4 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: A bit of improvement for "list --multiple" (which is still undocumented), continuing if a list reports an error and showing a heading for each list.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp

@@ -2210 +2210 @@
     bool                fOptMultiple  = false;
     bool                fOptSorted    = false;
+    bool                fFirst        = true;
     enum ListType_T     enmOptCommand = kListNotSpecified;
+    RTEXITCODE          rcExit = RTEXITCODE_SUCCESS;
 
     static const RTGETOPTDEF s_aListOptions[] =
@@ -2312 +2314 @@
                 if (fOptMultiple)
                 {
+                    if (fFirst)
+                        fFirst = false;
+                    else
+                        RTPrintf("\n");
+                    RTPrintf("[%s]\n", ValueUnion.pDef->pszLong);
                     HRESULT hrc = produceList(enmOptCommand, fOptLong, fOptSorted, a->virtualBox);
                     if (FAILED(hrc))
-                        return RTEXITCODE_FAILURE;
+                        rcExit = RTEXITCODE_FAILURE;
                 }
                 break;
@@ -2335 +2342 @@
         HRESULT hrc = produceList(enmOptCommand, fOptLong, fOptSorted, a->virtualBox);
         if (FAILED(hrc))
-            return RTEXITCODE_FAILURE;
-    }
-
-    return RTEXITCODE_SUCCESS;
+            rcExit = RTEXITCODE_FAILURE;
+    }
+
+    return rcExit;
 }