mirror of
https://github.com/odin-lang/Odin.git
synced 2025-12-29 01:14:40 +00:00
Merge pull request #4437 from dpoetzschke/fix/windows-args-escaping
fix windows args parser problem from issue #4393
This commit is contained in:
@@ -412,6 +412,32 @@ gb_internal String concatenate4_strings(gbAllocator a, String const &x, String c
|
||||
return make_string(data, len);
|
||||
}
|
||||
|
||||
#if defined(GB_SYSTEM_WINDOWS)
|
||||
gb_internal String escape_char(gbAllocator a, String s, char cte) {
|
||||
isize buf_len = s.len;
|
||||
isize cte_count = 0;
|
||||
for (isize j = 0; j < s.len; j++) {
|
||||
if (s.text[j] == cte) {
|
||||
cte_count++;
|
||||
}
|
||||
}
|
||||
|
||||
u8 *buf = gb_alloc_array(a, u8, buf_len+cte_count);
|
||||
isize i = 0;
|
||||
for (isize j = 0; j < s.len; j++) {
|
||||
u8 c = s.text[j];
|
||||
|
||||
if (c == cte) {
|
||||
buf[i++] = '\\';
|
||||
buf[i++] = c;
|
||||
} else {
|
||||
buf[i++] = c;
|
||||
}
|
||||
}
|
||||
return make_string(buf, i);
|
||||
}
|
||||
#endif
|
||||
|
||||
gb_internal String string_join_and_quote(gbAllocator a, Array<String> strings) {
|
||||
if (!strings.count) {
|
||||
return make_string(nullptr, 0);
|
||||
@@ -427,7 +453,11 @@ gb_internal String string_join_and_quote(gbAllocator a, Array<String> strings) {
|
||||
if (i > 0) {
|
||||
s = gb_string_append_fmt(s, " ");
|
||||
}
|
||||
#if defined(GB_SYSTEM_WINDOWS)
|
||||
s = gb_string_append_fmt(s, "\"%.*s\" ", LIT(escape_char(a, strings[i], '\\')));
|
||||
#else
|
||||
s = gb_string_append_fmt(s, "\"%.*s\" ", LIT(strings[i]));
|
||||
#endif
|
||||
}
|
||||
|
||||
return make_string(cast(u8 *) s, gb_string_length(s));
|
||||
|
||||
Reference in New Issue
Block a user