cli: Don't replace, but instead prepend the environment variable.

diff --git a/cli/cli_trace.cpp b/cli/cli_trace.cpp
index 52843c70703564af811410553a3cfc95dd278fb5..5903bdc5f7865cd7327a71b9b14f50d97a567e37 100644 (file)
--- a/cli/cli_trace.cpp
+++ b/cli/cli_trace.cpp
@@ -154,39 +154,57 @@ traceProgram(trace::API api,
     wrapperPath.trimFilename();
 #endif
 
+    /*
+     * Spawn child process.
+     */
+
+    {
 #if defined(TRACE_VARIABLE)
-    if (verbose) {
-        std::cerr << TRACE_VARIABLE << "=" << wrapperPath.str() << "\n";
-    }
-    /* FIXME: Don't modify the current environment */
-    os::setEnvironment(TRACE_VARIABLE, wrapperPath.str());
+        const char *oldEnvVarValue = getenv(TRACE_VARIABLE);
+        if (oldEnvVarValue) {
+            wrapperPath.append(OS_PATH_SEP);
+            wrapperPath.append(oldEnvVarValue);
+        }
+
+        /* FIXME: Don't modify our (ie parent) environment */
+        os::setEnvironment(TRACE_VARIABLE, wrapperPath.str());
+
+        if (verbose) {
+            std::cerr << TRACE_VARIABLE << "=" << wrapperPath.str() << "\n";
+        }
 #endif /* TRACE_VARIABLE */
 
-    if (output) {
-        os::setEnvironment("TRACE_FILE", output);
-    }
+        if (output) {
+            os::setEnvironment("TRACE_FILE", output);
+        }
 
-    for (char * const * arg = argv; *arg; ++arg) {
-        args.push_back(*arg);
-    }
+        for (char * const * arg = argv; *arg; ++arg) {
+            args.push_back(*arg);
+        }
 
-    if (verbose) {
-        const char *sep = "";
-        for (unsigned i = 0; i < args.size(); ++i) {
-            std::cerr << sep << args[i];
-            sep = " ";
+        if (verbose) {
+            const char *sep = "";
+            for (unsigned i = 0; i < args.size(); ++i) {
+                std::cerr << sep << args[i];
+                sep = " ";
+            }
+            std::cerr << "\n";
         }
-        std::cerr << "\n";
-    }
 
-    args.push_back(NULL);
+        args.push_back(NULL);
 
-    status = os::execute((char * const *)&args[0]);
+        status = os::execute((char * const *)&args[0]);
 
-exit:
 #if defined(TRACE_VARIABLE)
-    os::unsetEnvironment(TRACE_VARIABLE);
+        if (oldEnvVarValue) {
+            os::setEnvironment(TRACE_VARIABLE, oldEnvVarValue);
+        } else {
+            os::unsetEnvironment(TRACE_VARIABLE);
+        }
 #endif
+    }
+
+exit:
 #if defined(_WIN32)
     if (!useInject) {
         os::String tmpWrapper(argv[0]);

diff --git a/common/os_string.hpp b/common/os_string.hpp
index 3a8eab688552b1bb39f187bc57fc2981f4e5bd1c..35156a101b0f16d74e8af79c5c0c7b1f5aa88c3f 100644 (file)
--- a/common/os_string.hpp
+++ b/common/os_string.hpp
@@ -57,8 +57,10 @@ extern "C" _CRTIMP int _vscprintf(const char *format, va_list argptr);
 
 #ifdef _WIN32
 #define OS_DIR_SEP '\\'
+#define OS_PATH_SEP ';'
 #else /* !_WIN32 */
 #define OS_DIR_SEP '/'
+#define OS_PATH_SEP ':'
 #endif /* !_WIN32 */