Changeset 80824 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Sep 16, 2019 1:18:44 PM (6 years ago)

Author:

vboxsync

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

133393

Message:

Main: bugref:9341: The "environment" parameter in the IMachine::launchVMProcess renamed to "environmentChanges" and changed the type from wstring to "safearray of wstrings"

File:

• trunk/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp

@@ -75 +75 @@
                                 const Utf8Str &aComment,
                                 const Utf8Str &aFrontend,
-                                const Utf8Str &aEnvironment,
+                                const std::vector<com::Utf8Str> &aEnvironmentChanges,
                                 const Utf8Str &aExtraArg,
                                 const Utf8Str &aFilename,
@@ -105 +105 @@
 
     RTENV hEnv = RTENV_DEFAULT;
-    if (!aEnvironment.isEmpty())
-    {
-        Utf8Str strEnvCopy(aEnvironment); /* auto release trick */
-
+    if (!aEnvironmentChanges.empty())
+    {
 #ifdef IN_VBOXSVC
         /* VBoxSVC: clone the current environment */
@@ -120 +118 @@
         AssertRCReturn(vrc, vrc);
 
-        /* Apply the specified environment changes (ignoring empty variable names
-           as RTEnv intentionally does not support that). */
-        char *pszEnvMutable = strEnvCopy.mutableRaw();
-        char *pszVar = pszEnvMutable;
-        for (char *psz = pszEnvMutable; ; ++psz)
-        {
-            /** @todo r=bird: Broken escaping rule, how to end a variable with '\\'?
-              * E.g. TMP=C:\\TEMP\\  */
-            char const ch = *psz;
-            if (   (ch == '\n' && (psz == pszEnvMutable || psz[-1] != '\\'))
-                || ch == '\0')
-            {
-                *psz = '\0';
-                if (*pszVar)
-                {
-                    char *val = strchr(pszVar, '=');
-                    if (val)
-                    {
-                        *val++ = '\0';
-                        vrc = RTEnvSetEx(hEnv, pszVar, val);
-                    }
-                    else
-                        vrc = RTEnvUnsetEx(hEnv, pszVar);
-                    if (RT_FAILURE(vrc))
-                    {
-                        RTEnvDestroy(hEnv);
-                        return vrc;
-                    }
-                }
-                if (!ch)
-                    break;
-                pszVar = psz + 1;
-            }
+        /* Apply the specified environment changes. */
+        for (std::vector<com::Utf8Str>::const_iterator itEnv = aEnvironmentChanges.begin();
+             itEnv != aEnvironmentChanges.end();
+             ++itEnv)
+        {
+            vrc = RTEnvPutEx(hEnv, itEnv->c_str());
+            AssertRCReturnStmt(vrc, RTEnvDestroy(hEnv), vrc);
         }
     }