Changeset 43639 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Oct 15, 2012 12:13:31 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

81387

Message:

Fe/VBoxManage: Close the session after execution usage. Todos.

File:

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

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

@@ -734 +734 @@
     }
 
+    /** @todo This eventually needs a bit of revamping so that a valid session gets passed
+     *        into this function already so that we don't need to mess around with closing
+     *        the session all over the places below again. Later. */
+
     ComPtr<IGuestSession> pGuestSession;
     rc = pGuest->CreateSession(Bstr(strUsername).raw(),
@@ -762 +766 @@
     {
         ctrlPrintError(pGuestSession, COM_IIDOF(IGuestSession));
+
+        pGuestSession->Close();
         return RTEXITCODE_FAILURE;
     }
@@ -805 +811 @@
             {
                 ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+
+                pGuestSession->Close();
                 return RTEXITCODE_FAILURE;
             }
@@ -819 +827 @@
                         {
                             ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+
+                            pGuestSession->Close();
                             return RTEXITCODE_FAILURE;
                         }
@@ -875 +885 @@
             {
                 ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+
+                pGuestSession->Close();
                 return RTEXITCODE_FAILURE;
             }
@@ -882 +894 @@
             {
                 ctrlPrintError(pProcess, COM_IIDOF(IProcess));
+
+                pGuestSession->Close();
                 return RTEXITCODE_FAILURE;
             }
             if (fVerbose)
                 RTPrintf("Exit code=%u (Status=%u [%s])\n", exitCode, status, ctrlExecProcessStatusToText(status));
+
+            pGuestSession->Close();
             return ctrlExecProcessStatusToExitCode(status, exitCode);
         }
@@ -892 +908 @@
             if (fVerbose)
                 RTPrintf("Process execution aborted!\n");
+
+            pGuestSession->Close();
             return EXITCODEEXEC_TERM_ABEND;
         }
@@ -2685 +2703 @@
                  || !strcmp(pArg->argv[1], "updateadds"))
             rcExit = handleCtrlUpdateAdditions(guest, &arg);
+        /** @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]);