Changeset 42682 in vbox for trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

Timestamp:

Aug 8, 2012 1:41:32 PM (12 years ago)

Author:

vboxsync

Message:

Main/GuestCtrl: fixes to FileDelete and DirectoryCreateTemp.

File:

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

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

@@ -1753 +1753 @@
                                        strTemplate.c_str()));
         procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_MKTEMP);
+        procInfo.mFlags   =   ProcessCreateFlag_Hidden
+                            | ProcessCreateFlag_WaitForStdOut;
         /* Construct arguments. */
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
@@ -1775 +1777 @@
                                    30 * 1000 /* Timeout */, waitRes);
             if (   RT_FAILURE(rc)
-                || waitRes.mResult != ProcessWaitResult_StdOut)
+                || waitRes.mResult == ProcessWaitResult_Terminate
+                || waitRes.mResult == ProcessWaitResult_Error
+                || waitRes.mResult == ProcessWaitResult_Timeout)
             {
                 break;
@@ -1786 +1790 @@
                 break;
 
-            rc = streamOut.AddData(byBuf, cbRead);
-            if (RT_FAILURE(rc))
-                break;
+            if (cbRead)
+            {
+                rc = streamOut.AddData(byBuf, cbRead);
+                if (RT_FAILURE(rc))
+                    break;
+            }
         }
 
@@ -1794 +1801 @@
                          rc, cbRead, streamOut.GetSize()));
     } 
-
+    else
+        return setError(E_FAIL, tr("Error while starting temporary directory creation tool on guest: %Rrc"), rc);
     if (RT_FAILURE(rc))
-        return setError(E_FAIL, tr("Error while creating temporary directory: %Rrc"), rc);
+        return setError(E_FAIL, tr("Error while running temporary directory creation tool: %Rrc"), rc);
     if (!streamOut.GetSize())
         return setError(E_FAIL, tr("No return code after creating temporary directory"));
@@ -1807 +1815 @@
         if (RT_FAILURE(streamBlock.GetInt64Ex("rc", &i64rc)))
             return setError(E_FAIL, tr("No return code after creating temporary directory"));
-        // *aReturnCode = (LONG)i64rc;
+        if (RT_FAILURE((int)i64rc))
+            return setError(VBOX_E_IPRT_ERROR, tr("File deletion failed: %Rrc"), rc);
     }
     else
@@ -2152 +2161 @@
                                        strPath.c_str()));
         procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_RM);
+        procInfo.mFlags   =   ProcessCreateFlag_Hidden
+                            | ProcessCreateFlag_WaitForStdOut;
         /* Construct arguments. */
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
@@ -2164 +2175 @@
     rc = processCreateExInteral(procInfo, pProcess);
     if (RT_SUCCESS(rc))
+        rc = pProcess->startProcess();
+    if (RT_SUCCESS(rc))
     {
         GuestProcessWaitResult waitRes;
@@ -2174 +2187 @@
                                    30 * 1000 /* Timeout */, waitRes);
             if (   RT_FAILURE(rc)
-                || waitRes.mResult != ProcessWaitResult_StdOut)
+                || waitRes.mResult == ProcessWaitResult_Terminate
+                || waitRes.mResult == ProcessWaitResult_Error
+                || waitRes.mResult == ProcessWaitResult_Timeout)
             {
                 break;
@@ -2185 +2200 @@
                 break;
 
-            rc = streamOut.AddData(byBuf, cbRead);
-            if (RT_FAILURE(rc))
-                break;
+            if (cbRead)
+            {
+                rc = streamOut.AddData(byBuf, cbRead);
+                if (RT_FAILURE(rc))
+                    break;
+            }
         }
 
@@ -2193 +2211 @@
                          rc, cbRead, streamOut.GetSize()));
     }
-
+    else
+        return setError(E_FAIL, tr("Error while starting delete tool on guest: %Rrc"), rc);
     if (RT_FAILURE(rc))
-        return setError(E_FAIL, tr("Error while deleting file: %Rrc"), rc);
+        return setError(E_FAIL, tr("Error while running delete tool on guest: %Rrc"), rc);
     if (!streamOut.GetSize())
         return setError(E_FAIL, tr("No return code after deleting file"));
@@ -2206 +2225 @@
         if (RT_FAILURE(streamBlock.GetInt64Ex("rc", &i64rc)))
             return setError(E_FAIL, tr("No return code after deleting file"));
+        if (RT_FAILURE((int)i64rc))
+            return setError(VBOX_E_IPRT_ERROR, tr("File deletion failed: %Rrc"), rc);
     }
     else