summaryrefslogtreecommitdiff
path: root/sway/stringop.c
diff options
context:
space:
mode:
authortaiyu <[email protected]>2015-09-08 10:53:15 -0700
committertaiyu <[email protected]>2015-09-08 10:53:15 -0700
commit6388241abb7e2e66e716fc128e658d3d3419442a (patch)
treeac715db07ee07ff0226434e9a8228d187a77cb64 /sway/stringop.c
parent799ff640f8c15dde5f8d65fdd71f91bab7aaa5fe (diff)
mode supports multi token names
Diffstat (limited to 'sway/stringop.c')
-rw-r--r--sway/stringop.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/sway/stringop.c b/sway/stringop.c
index 7de6eded..270e673a 100644
--- a/sway/stringop.c
+++ b/sway/stringop.c
@@ -99,7 +99,7 @@ void free_flat_list(list_t *list) {
char **split_args(const char *start, int *argc) {
*argc = 0;
int alloc = 2;
- char **parts = malloc(sizeof(char *) * alloc);
+ char **argv = malloc(sizeof(char *) * alloc);
bool in_token = false;
bool in_string = false;
bool in_char = false;
@@ -132,15 +132,16 @@ char **split_args(const char *start, int *argc) {
token[end - start] = '\0';
strip_quotes(token);
unescape_string(token);
- parts[*argc] = token;
- if (++*argc == alloc) {
- parts = realloc(parts, (alloc *= 2) * sizeof(char *));
+ argv[*argc] = token;
+ if (++*argc + 1 == alloc) {
+ argv = realloc(argv, (alloc *= 2) * sizeof(char *));
}
}
in_token = false;
escaped = false;
}
- return parts;
+ argv[*argc] = NULL;
+ return argv;
}
void free_argv(int argc, char **argv) {