aboutsummaryrefslogtreecommitdiff
path: root/tokenize.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-28 18:01:56 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-28 18:01:56 +0000
commit295083059ca8f642437abf44329698d1bbbb0067 (patch)
treee6ebc7f9d0330589a19c420f7ba138438eb8e74c /tokenize.c
parentchangelog: improved font size consistency across monitors with different DPI (diff)
parentconfig: fix check for scrollback-indicator-format=percentage (diff)
Merge branch 'master' into diagonal-dpi
Diffstat (limited to 'tokenize.c')
-rw-r--r--tokenize.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/tokenize.c b/tokenize.c
index b4aab6b5..35d52345 100644
--- a/tokenize.c
+++ b/tokenize.c
@@ -38,14 +38,16 @@ tokenize_cmdline(char *cmdline, char ***argv)
char delim = first_token_is_quoted ? cmdline[0] : ' ';
char *p = first_token_is_quoted ? &cmdline[1] : &cmdline[0];
+ char *search_start = p;
size_t idx = 0;
while (*p != '\0') {
- char *end = strchr(p, delim);
+ char *end = strchr(search_start, delim);
if (end == NULL) {
if (delim != ' ') {
- LOG_ERR("unterminated %s quote\n", delim == '"' ? "double" : "single");
+ LOG_ERR("unterminated %s quote", delim == '"' ? "double" : "single");
free(*argv);
+ *argv = NULL;
return false;
}
@@ -57,6 +59,15 @@ tokenize_cmdline(char *cmdline, char ***argv)
return true;
}
+ if (end > p && *(end - 1) == '\\') {
+ /* Escaped quote, remove one level of escaping and
+ * continue searching for "our" closing quote */
+ memmove(end - 1, end, strlen(end));
+ end[strlen(end) - 1] = '\0';
+ search_start = end;
+ continue;
+ }
+
*end = '\0';
if (!push_argv(argv, &argv_size, p, &idx))
@@ -74,6 +85,7 @@ tokenize_cmdline(char *cmdline, char ***argv)
p++;
} else
delim = ' ';
+ search_start = p;
}
if (!push_argv(argv, &argv_size, NULL, &idx))