Changeset 47311 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 22, 2013 3:10:45 PM (12 years ago)

Author:

vboxsync

Message:

VBoxManage/GuestCtrl: Make "guestcontrol list <sessions|processes|all>" available to all.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (6 diffs)

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

@@ -258 +258 @@
                  "                            [--directory] [--secure] [--tmpdir <directory>]\n"
                  "                            [--domain <domain>] [--mode <mode>] [--verbose]\n"
+                 "\n"
+                 "                            list <all|sessions|processes> [--verbose]\n"
                  "\n"
                  "                            stat\n"
@@ -2782 +2784 @@
 }
 
-#ifdef DEBUG
 static RTEXITCODE handleCtrlList(ComPtr<IGuest> guest, HandlerArg *pArg)
 {
@@ -2792 +2793 @@
     RTEXITCODE rcExit = RTEXITCODE_SUCCESS;
 
+    bool fListAll = false;
     bool fListSessions = false;
+    bool fListProcesses = false;
     if (!RTStrICmp(pArg->argv[0], "sessions"))
         fListSessions = true;
-    bool fListProcesses = false;
-    if (!RTStrICmp(pArg->argv[0], "all"))
-    {
-        fListSessions = true;
-        fListProcesses = true;
-    }
-
-    if (fListSessions)
+    else if (!RTStrICmp(pArg->argv[0], "processes"))
+        fListSessions = fListProcesses = true; /* Showing processes implies showing sessions. */
+    else if (!RTStrICmp(pArg->argv[0], "all"))
+        fListAll = true;
+
+    /** @todo Handle "--verbose" using RTGetOpt. */
+    /** @todo Do we need a machine-readable output here as well? */
+
+    if (   fListAll
+        || fListSessions)
     {
         RTPrintf("Active guest sessions:\n");
@@ -2828 +2833 @@
                              i, uID, strUser.raw(), strName.raw());
 
-                    if (fListProcesses)
+                    if (   fListAll
+                        || fListProcesses)
                     {
                         SafeIfaceArray <IGuestProcess> collProcesses;
@@ -2865 +2871 @@
     return rcExit;
 }
-#endif
 
 /**
@@ -2915 +2920 @@
                  || !strcmp(pArg->argv[1], "updateadds"))
             rcExit = handleCtrlUpdateAdditions(guest, &arg);
-#ifdef DEBUG
         else if (   !strcmp(pArg->argv[1], "list"))
             rcExit = handleCtrlList(guest, &arg);
-#endif
-        /** @todo Implement a "sessions list" command to list all opened
-         *        guest sessions along with their (friendly) names. */
         else
             rcExit = errorSyntax(USAGE_GUESTCONTROL, "Unknown sub command '%s' specified!", pArg->argv[1]);