Changeset 47560 in vbox

Timestamp:

Aug 6, 2013 2:53:46 PM (11 years ago)

Author:

vboxsync

Message:

FE/VBoxManage: Be a bit more informative.

File:

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

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

@@ -838 +838 @@
                                Bstr(strPassword).raw(),
                                Bstr(strDomain).raw(),
-                               Bstr("VBoxManage Guest Control Exec").raw(),
+                               Bstr("VBoxManage Guest Control").raw(),
                                pGuestSession.asOutParam());
     if (FAILED(rc))
@@ -3050 +3050 @@
     do
     {
+        uint32_t uProcsTerminated = 0;
         bool fSessionFound = false;
 
@@ -3056 +3057 @@
         size_t cSessions = collSessions.size();
 
+        uint32_t uSessionsHandled = 0;
         for (size_t i = 0; i < cSessions; i++)
         {
@@ -3066 +3068 @@
             CHECK_ERROR_BREAK(pSession, COMGETTER(Name)(strName.asOutParam()));
             Utf8Str strNameUtf8(strName); /* Session name */
-
             if (strSessionName.isEmpty()) /* Search by ID. Slow lookup. */
             {
@@ -3079 +3080 @@
             if (fSessionFound)
             {
-                Assert(!pSession.isNull());
+                AssertStmt(!pSession.isNull(), break);
+                uSessionsHandled++;
 
                 SafeIfaceArray <IGuestProcess> collProcs;
@@ -3107 +3109 @@
                                      uPID, uID);
                         CHECK_ERROR_BREAK(pProcess, Terminate());
+                        uProcsTerminated++;
+                    }
+                    else
+                    {
+                        if (ulSessionID != UINT32_MAX)
+                            RTPrintf("No matching process(es) for session %RU32 found\n",
+                                     ulSessionID);
                     }
 
@@ -3116 +3125 @@
         }
 
-        if (!fSessionFound)
-        {
-            RTPrintf("No guest session(s) found\n");
-            rc = E_ABORT; /* To set exit code accordingly. */
-        }
+        if (!uSessionsHandled)
+            RTPrintf("No matching session(s) found\n");
+
+        if (uProcsTerminated)
+            RTPrintf("%RU32 %s terminated\n",
+                     uProcsTerminated, uProcsTerminated == 1 ? "process" : "processes");
 
     } while (0);