Changeset 64434 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Oct 27, 2016 11:38:06 AM (8 years ago)

Author:

vboxsync

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

111563

Message:

Frontends/VBoxManage: add --putenv option to the "startvm" command

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageMisc.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -950 +950 @@
         RTStrmPrintf(pStrm, "|headless|separate]\n");
         RTStrmPrintf(pStrm,
+                     "                            [-E|--putenv <NAME>[=<VALUE>]]\n"
                      "\n");
     }

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -496 +496 @@
     std::list<const char *> VMs;
     Bstr sessionType;
+    Utf8Str strEnv;
+
+#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
+    /* make sure the VM process will by default start on the same display as VBoxManage */
+    {
+        const char *pszDisplay = RTEnvGet("DISPLAY");
+        if (pszDisplay)
+            strEnv = Utf8StrFmt("DISPLAY=%s\n", pszDisplay);
+        const char *pszXAuth = RTEnvGet("XAUTHORITY");
+        if (pszXAuth)
+            strEnv.append(Utf8StrFmt("XAUTHORITY=%s\n", pszXAuth));
+    }
+#endif
 
     static const RTGETOPTDEF s_aStartVMOptions[] =
@@ -501 +514 @@
         { "--type",         't', RTGETOPT_REQ_STRING },
         { "-type",          't', RTGETOPT_REQ_STRING },     // deprecated
+        { "--putenv",       'E', RTGETOPT_REQ_STRING },
     };
     int c;
@@ -537 +551 @@
                 break;
 
+            case 'E':   // --putenv
+                if (!RTStrStr(ValueUnion.psz, "\n"))
+                    strEnv.append(Utf8StrFmt("%s\n", ValueUnion.psz));
+                else
+                    return errorSyntax(USAGE_STARTVM, "Parameter to option --putenv must not contain any newline character");
+                break;
+
             case VINF_GETOPT_NOT_OPTION:
                 VMs.push_back(ValueUnion.psz);
@@ -573 +594 @@
         if (machine)
         {
-            Bstr env;
-#if defined(RT_OS_LINUX) || defined(RT_OS_SOLARIS)
-            /* make sure the VM process will start on the same display as VBoxManage */
-            Utf8Str str;
-            const char *pszDisplay = RTEnvGet("DISPLAY");
-            if (pszDisplay)
-                str = Utf8StrFmt("DISPLAY=%s\n", pszDisplay);
-            const char *pszXAuth = RTEnvGet("XAUTHORITY");
-            if (pszXAuth)
-                str.append(Utf8StrFmt("XAUTHORITY=%s\n", pszXAuth));
-            env = str;
-#endif
             ComPtr<IProgress> progress;
             CHECK_ERROR(machine, LaunchVMProcess(a->session, sessionType.raw(),
-                                                 env.raw(), progress.asOutParam()));
+                                                 Bstr(strEnv).raw(), progress.asOutParam()));
             if (SUCCEEDED(rc) && !progress.isNull())
             {