zefie/llvm-mingw
1
0 Fork 0
Code Activity

windres-wrapper: Do the format name comparisons case insensitively

Browse Source
This commit is contained in:
Martin Storsjö committed 2020-03-14 12:58:18 +02:00
1 parent 96b149eb72
commit 8507ee6023
2 files changed
+14 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

wrappers/native-wrapper.h
+9
View File
@@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h>
#ifdef _WIN32 #ifdef _WIN32
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@@ -94,6 +95,14 @@ static inline int _tspawnvp_escape(int mode, const TCHAR *filename, const TCHAR
escaped_argv[num_args] = NULL; escaped_argv[num_args] = NULL;
return _tspawnvp(mode, filename, escaped_argv); return _tspawnvp(mode, filename, escaped_argv);
} }
#else
static inline int _tcsicmp(const TCHAR *a, const TCHAR *b) {
while (*a && tolower(*a) == tolower(*b)) {
a++;
b++;
}
return *a - *b;
}
#endif #endif
static inline TCHAR *concat(const TCHAR *prefix, const TCHAR *suffix) { static inline TCHAR *concat(const TCHAR *prefix, const TCHAR *suffix) {
wrappers/windres-wrapper.c
+5 -5
View File
@@ -292,7 +292,7 @@ int _tmain(int argc, TCHAR* argv[]) {
const TCHAR **exec_argv = malloc((max_arg + 1) * sizeof(*exec_argv)); const TCHAR **exec_argv = malloc((max_arg + 1) * sizeof(*exec_argv));
int arg = 0; int arg = 0;
if (!_tcscmp(input_format, _T("rc"))) { if (!_tcsicmp(input_format, _T("rc"))) {
exec_argv[arg++] = concat(dir, CC); exec_argv[arg++] = concat(dir, CC);
exec_argv[arg++] = _T("-E"); exec_argv[arg++] = _T("-E");
for (int i = 0; i < nb_cpp_options; i++) for (int i = 0; i < nb_cpp_options; i++)
@@ -327,7 +327,7 @@ int _tmain(int argc, TCHAR* argv[]) {
exec_argv[arg++] = _T("-c"); exec_argv[arg++] = _T("-c");
exec_argv[arg++] = codepage; exec_argv[arg++] = codepage;
exec_argv[arg++] = _T("-fo"); exec_argv[arg++] = _T("-fo");
if (!_tcscmp(output_format, _T("res"))) if (!_tcsicmp(output_format, _T("res")))
exec_argv[arg++] = output; exec_argv[arg++] = output;
else else
exec_argv[arg++] = res; exec_argv[arg++] = res;
@@ -348,9 +348,9 @@ int _tmain(int argc, TCHAR* argv[]) {
return ret; return ret;
} }
if (!_tcscmp(output_format, _T("res"))) { if (!_tcsicmp(output_format, _T("res"))) {
// All done // All done
} else if (!_tcscmp(output_format, _T("coff"))) { } else if (!_tcsicmp(output_format, _T("coff"))) {
arg = 0; arg = 0;
exec_argv[arg++] = concat(dir, _T("llvm-cvtres")); exec_argv[arg++] = concat(dir, _T("llvm-cvtres"));
exec_argv[arg++] = res; exec_argv[arg++] = res;
@@ -374,7 +374,7 @@ int _tmain(int argc, TCHAR* argv[]) {
} else { } else {
error(basename, _T("invalid output format: `"TS"'"), output_format); error(basename, _T("invalid output format: `"TS"'"), output_format);
} }
} else if (!_tcscmp(input_format, _T("res"))) { } else if (!_tcsicmp(input_format, _T("res"))) {
exec_argv[arg++] = concat(dir, _T("llvm-cvtres")); exec_argv[arg++] = concat(dir, _T("llvm-cvtres"));
exec_argv[arg++] = input; exec_argv[arg++] = input;
exec_argv[arg++] = concat(_T("-machine:"), machine); exec_argv[arg++] = concat(_T("-machine:"), machine);