ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-29 19:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4437 from dpoetzschke/fix/windows-args-escaping

Browse Source 
fix windows args parser problem from issue #4393
This commit is contained in:
gingerBill
2024-11-06 13:08:55 +00:00
committed by GitHub
parent 1419d0d295 f1de4804a5
commit e8f231ee72
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/string.cpp
+30
View File
@@ -412,6 +412,32 @@ gb_internal String concatenate4_strings(gbAllocator a, String const &x, String c
return make_string(data, len); 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) { gb_internal String string_join_and_quote(gbAllocator a, Array<String> strings) {
if (!strings.count) { if (!strings.count) {
return make_string(nullptr, 0); return make_string(nullptr, 0);
@@ -427,7 +453,11 @@ gb_internal String string_join_and_quote(gbAllocator a, Array<String> strings) {
if (i > 0) { if (i > 0) {
s = gb_string_append_fmt(s, " "); 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])); s = gb_string_append_fmt(s, "\"%.*s\" ", LIT(strings[i]));
#endif
} }
return make_string(cast(u8 *) s, gb_string_length(s)); return make_string(cast(u8 *) s, gb_string_length(s));