diff options
author | Dmitry Lomov <dslomov@google.com> | 2015-08-11 16:44:21 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-08-12 15:22:10 +0000 |
commit | 78c0cc73d3fec13add33b3ac811748647d76b38f (patch) | |
tree | 71fdd959dec21ce52750b6fcf2a28f59733ab272 /src/main/cpp/blaze_util.cc | |
parent | 3e791009408bcae7f52ba4ae84a14c6c2460fed1 (diff) |
Avoid command line argument mangling on Windows.
exec(3) under mingw converts every command line argument that looks like Unix path
into Windows path when executing non-mingw images (criteria for non-mingw image is
that the image does not depend on msys-<version>.dll). This affects bazel labels
(`//foo:bar` becomes `/foo:bar` for example).
This CL:
1) Replaces usage of execv(3) with Windows-native CreateProcess.
2) Converts all command line arguments that are indeed paths into Windows paths.
--
MOS_MIGRATED_REVID=100386350
Diffstat (limited to 'src/main/cpp/blaze_util.cc')
-rw-r--r-- | src/main/cpp/blaze_util.cc | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/main/cpp/blaze_util.cc b/src/main/cpp/blaze_util.cc index ae84d75d59..a6d96decf6 100644 --- a/src/main/cpp/blaze_util.cc +++ b/src/main/cpp/blaze_util.cc @@ -32,6 +32,7 @@ #include <sstream> +#include "src/main/cpp/blaze_util_platform.h" #include "src/main/cpp/util/errors.h" #include "src/main/cpp/util/exit_code.h" #include "src/main/cpp/util/file.h" @@ -243,37 +244,6 @@ int GetTerminalColumns() { return 80; // default if not a terminal. } -// Replace the current process with the given program in the given working -// directory, using the given argument vector. -// This function does not return on success. -void ExecuteProgram(const string& exe, const vector<string>& args_vector) { - if (VerboseLogging()) { - string dbg; - for (const auto& s : args_vector) { - dbg.append(s); - dbg.append(" "); - } - - char cwd[PATH_MAX] = {}; - if (getcwd(cwd, sizeof(cwd)) == NULL) { - pdie(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR, "getcwd() failed"); - } - - fprintf(stderr, "Invoking binary %s in %s:\n %s\n", - exe.c_str(), cwd, dbg.c_str()); - } - - // Copy to a char* array for execv: - int n = args_vector.size(); - const char **argv = new const char *[n + 1]; - for (int i = 0; i < n; ++i) { - argv[i] = args_vector[i].c_str(); - } - argv[n] = NULL; - - execv(exe.c_str(), const_cast<char**>(argv)); -} - const char* GetUnaryOption(const char *arg, const char *next_arg, const char *key) { |