zefie/llvm-mingw
1
0 Fork 0
Code Activity

wrappers: Escape the first argument to spawn

Browse Source 
This fixes running in paths that contain a space.
This commit is contained in:
Martin Storsjö committed 2019-05-06 11:04:53 +03:00
1 parent 97ca0681bc
commit fa88c4ee1e
2 files changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

wrappers/clang-target-wrapper.c
+1 -1
View File
@@ -165,7 +165,7 @@ int _tmain(int argc, TCHAR* argv[]) {
int arg = 0;
if (getenv("CCACHE"))
exec_argv[arg++] = _T("ccache");
exec_argv[arg++] = concat(dir, _T(CLANG));
exec_argv[arg++] = escape(concat(dir, _T(CLANG)));
// If changing this wrapper, change clang-target-wrapper.sh accordingly.
if (!_tcscmp(exe, _T("clang++")) || !_tcscmp(exe, _T("g++")) || !_tcscmp(exe, _T("c++")))
wrappers/windres-wrapper.c
+4 -4
View File
@@ -287,7 +287,7 @@ int _tmain(int argc, TCHAR* argv[]) {
int arg = 0;
if (!_tcscmp(input_format, _T("rc"))) {
exec_argv[arg++] = concat(dir, CC);
exec_argv[arg++] = escape(concat(dir, CC));
exec_argv[arg++] = _T("-E");
for (int i = 0; i < nb_cpp_options; i++)
exec_argv[arg++] = escape(cpp_options[i]);
@@ -312,7 +312,7 @@ int _tmain(int argc, TCHAR* argv[]) {
}
arg = 0;
exec_argv[arg++] = concat(dir, _T("llvm-rc"));
exec_argv[arg++] = escape(concat(dir, _T("llvm-rc")));
for (int i = 0; i < nb_rc_options; i++)
exec_argv[arg++] = escape(rc_options[i]);
exec_argv[arg++] = _T("-I");
@@ -346,7 +346,7 @@ int _tmain(int argc, TCHAR* argv[]) {
// All done
} else if (!_tcscmp(output_format, _T("coff"))) {
arg = 0;
exec_argv[arg++] = concat(dir, _T("llvm-cvtres"));
exec_argv[arg++] = escape(concat(dir, _T("llvm-cvtres")));
exec_argv[arg++] = escape(res);
exec_argv[arg++] = concat(_T("-machine:"), machine);
exec_argv[arg++] = escape(concat(_T("-out:"), output));
@@ -369,7 +369,7 @@ int _tmain(int argc, TCHAR* argv[]) {
error(basename, _T("invalid output format: `"TS"'"), output_format);
}
} else if (!_tcscmp(input_format, _T("res"))) {
exec_argv[arg++] = concat(dir, _T("llvm-cvtres"));
exec_argv[arg++] = escape(concat(dir, _T("llvm-cvtres")));
exec_argv[arg++] = escape(input);
exec_argv[arg++] = concat(_T("-machine:"), machine);
exec_argv[arg++] = escape(concat(_T("-out:"), output));