aboutsummaryrefslogtreecommitdiff
path: root/spawn.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-23 10:54:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-23 10:54:55 +0000
commit4e5f5026b8abc4aa2e23a82f3e91196cb09ecabe (patch)
tree75e456ffe40c4c33d2ec8275c646c9204aeae7b5 /spawn.c
parentconfig: remove duplicated error logs for invalid colors (diff)
parentconfig: add new function config_clone() (diff)
Merge branch 'config-clone'
Diffstat (limited to 'spawn.c')
-rw-r--r--spawn.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/spawn.c b/spawn.c
index 22f0d1ed..8adef19d 100644
--- a/spawn.c
+++ b/spawn.c
@@ -114,7 +114,7 @@ spawn_expand_template(const struct config_spawn_template *template,
*argc = 0;
*argv = NULL;
- for (; template->argv[*argc] != NULL; (*argc)++)
+ for (; template->argv.args[*argc] != NULL; (*argc)++)
;
#define append(s, n) \
@@ -133,7 +133,7 @@ spawn_expand_template(const struct config_spawn_template *template,
char *expanded = NULL;
char *start = NULL;
- char *last_end = template->argv[i];
+ char *last_end = template->argv.args[i];
while ((start = strstr(last_end, "${")) != NULL) {
/* Append everything from the last template's end to this
@@ -173,7 +173,9 @@ spawn_expand_template(const struct config_spawn_template *template,
last_end = end + 1;
}
- append(last_end, template->argv[i] + strlen(template->argv[i]) - last_end);
+ append(
+ last_end,
+ template->argv.args[i] + strlen(template->argv.args[i]) - last_end);
(*argv)[i] = expanded;
}
(*argv)[*argc] = NULL;