Changeset 38133 in vbox for trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp

Timestamp:

Jul 25, 2011 9:02:17 AM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Removed obsolete code for guest directory enumeration.

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (5 diffs)

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

@@ -3387 +3387 @@
          */
 
+        /* We need to get output which is machine-readable in form
+         * of "key=value\0..key=value\0\0". */
+        args.push_back(Bstr("--machinereadable").raw());
+
         /* Only the actual file name to chekc is needed for now. */
         args.push_back(Bstr(Utf8File).raw());
@@ -3548 +3552 @@
                             {
                                 rc = this->GetProcessOutput(uPID, ProcessOutputFlag_None,
-                                                            30 * 1000 /* Timeout in ms */,
+                                                            10 * 1000 /* Timeout in ms */,
                                                             _64K, ComSafeArrayAsOutParam(aOutputData));
                                 /** @todo Do stream header validation! */
@@ -3557 +3561 @@
                                     if (RT_UNLIKELY(RT_FAILURE(vrc)))
                                         rc = setError(VBOX_E_IPRT_ERROR,
-                                                      tr("Error while adding guest output to stream buffer (%Rrc)"), vrc);
+                                                      tr("Query file size: Error while adding guest output to stream buffer for file \"%s\" (%Rrc)"),
+                                                      Utf8File.c_str(), vrc);
                                 }
-                                else
+                                else /* No more output! */
                                     break;
                             }
@@ -3575 +3580 @@
                                     else
                                         rc = setError(VBOX_E_IPRT_ERROR,
-                                                      tr("Unable to retrieve file size (%Rrc)"), vrc);
+                                                      tr("Query file size: Unable to retrieve file size for file \"%s\" (%Rrc)"),
+                                                      Utf8File.c_str(), vrc);
                                 }
                                 else
                                     rc = setError(VBOX_E_IPRT_ERROR,
-                                                  tr("Error while parsing guest output (%Rrc)"), vrc);
+                                                  tr("Query file size: Error while parsing guest output for file \"%s\" (%Rrc)"),
+                                                  Utf8File.c_str(), vrc);
                             }
                         }
                         else
                             rc = setError(VBOX_E_IPRT_ERROR,
-                                          tr("Error querying file size for file \"%s\" (exit code %u)"),
+                                          tr("Query file size: Error querying file size for file \"%s\" (exit code %u)"),
                                           Utf8File.c_str(), uRetExitCode);
                     }
@@ -3591 +3598 @@
             else if (fCanceled)
                 rc = setError(VBOX_E_IPRT_ERROR,
-                              tr("Checking for file existence was aborted"));
+                              tr("Query file size: Checking for file size was aborted"));
             else
-                AssertReleaseMsgFailed(("Checking for file existence neither completed nor canceled!?\n"));
+                AssertReleaseMsgFailed(("Checking for file size neither completed nor canceled!?\n"));
         }
     }