Changeset 42765 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 10, 2012 8:12:35 PM (12 years ago)

Author:

vboxsync

Message:

Main: GuestSession::DirectoryCreateTemp() (untested).

File:

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

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

@@ -2203 +2203 @@
 }
 
-STDMETHODIMP GuestSession::DirectoryCreateTemp(IN_BSTR aTemplate, ULONG aMode, IN_BSTR aName, BOOL aSecure, BSTR *aDirectory)
+STDMETHODIMP GuestSession::DirectoryCreateTemp(IN_BSTR aTemplate, ULONG aMode, IN_BSTR aPath, BOOL aSecure, BSTR *aDirectory)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2223 +2223 @@
     {
         Utf8Str strTemplate(aTemplate);
+        Utf8Str strPath(aPath);
         procInfo.mName    = Utf8StrFmt(tr("Creating temporary directory from template \"%s\"",
                                        strTemplate.c_str()));
@@ -2230 +2231 @@
         /* Construct arguments. */
         procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
-        procInfo.mArguments.push_back(Bstr(aTemplate)); /* The template we want to use. */
+        if (strPath.length())  /* Otherwise use /tmp or equivalent. */
+        {
+            procInfo.mArguments.push_back(Utf8Str("-d"));
+            procInfo.mArguments.push_back(strPath);
+        }
+        procInfo.mArguments.push_back(strTemplate);
     }
     catch (...)
@@ -2284 +2290 @@
     if (RT_SUCCESS(rc))
     {
-        streamBlock.GetString("name");
+        const char *pcszName = streamBlock.GetString("name");
+        if (!pcszName)
+            return setError(E_FAIL, tr("No name returned after creating temporary directory"));
         int64_t i64rc;
         if (RT_FAILURE(streamBlock.GetInt64Ex("rc", &i64rc)))
             return setError(E_FAIL, tr("No return code after creating temporary directory"));
         if (RT_FAILURE((int)i64rc))
-            return setError(VBOX_E_IPRT_ERROR, tr("File deletion failed: %Rrc"), rc);
+        {
+            HRESULT hrc =   i64rc == VERR_INVALID_PARAMETER ? E_INVALIDARG
+                          : i64rc == VERR_NOT_SUPPORTED ? VBOX_E_NOT_SUPPORTED
+                          : VBOX_E_IPRT_ERROR;
+            return setError(hrc, tr("Temporary directory creation failed: %Rrc"),
+                            (int)i64rc);
+        }
+        try
+        {
+            Bstr(pcszName).cloneTo(aDirectory);
+        }
+        catch (...)
+        {
+            return E_OUTOFMEMORY;
+        }
     }
     else