Changeset 71302 in vbox for trunk

Timestamp:

Mar 12, 2018 4:25:30 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control: Guest directory creation fixes.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDirectoryImpl.cpp (modified) (1 diff)
• GuestSessionImpl.cpp (modified) (3 diffs)

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

@@ -216 +216 @@
     switch (rcGuest)
     {
+        case VERR_CANT_CREATE:
+            strError += Utf8StrFmt("Access denied");
+            break;
+
         case VERR_DIR_NOT_EMPTY:
-            strError += Utf8StrFmt("Directoy is not empty");
+            strError += Utf8StrFmt("Not empty");
             break;
 

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

@@ -684 +684 @@
         }
 
-        if (uMode)
+        if (   RT_SUCCESS(vrc)
+            && uMode)
         {
             procInfo.mArguments.push_back(Utf8Str("--mode")); /* Set the creation mode. */
@@ -696 +697 @@
                 vrc = VERR_BUFFER_OVERFLOW;
         }
-        procInfo.mArguments.push_back("--"); /* '--version' is a valid directory name. */
+
+        procInfo.mArguments.push_back("--");    /* '--version' is a valid directory name. */
         procInfo.mArguments.push_back(strPath); /* The directory we want to create. */
     }
@@ -2776 +2778 @@
     if (RT_FAILURE(rc))
     {
-        switch (rc)
-        {
-            case VERR_GSTCTL_GUEST_ERROR:
-                hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: %s",
-                                                    GuestDirectory::i_guestErrorToString(rcGuest).c_str()));
-                break;
-
-            case VERR_INVALID_PARAMETER:
-                hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Invalid parameters given"));
-                break;
-
-            case VERR_BROKEN_PIPE:
-                hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Unexpectedly aborted"));
-                break;
-
-            default:
-                hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: %Rrc"), rc);
-                break;
+        if (GuestProcess::i_isGuestError(rc))
+        {
+            hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: %s"),
+                                                GuestDirectory::i_guestErrorToString(rcGuest).c_str());
+        }
+        else
+        {
+            switch (rc)
+            {
+                case VERR_INVALID_PARAMETER:
+                    hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Invalid parameters given"));
+                    break;
+
+                case VERR_BROKEN_PIPE:
+                    hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: Unexpectedly aborted"));
+                    break;
+
+                default:
+                    hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: %Rrc"), rc);
+                    break;
+            }
         }
     }