mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-04 04:06:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: add new function config_clone()

Browse source
This commit is contained in:
Daniel Eklöf 2021-06-18 16:18:41 +02:00
parent 42ec264075
commit f7860aec76
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
6 changed files with 217 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spawn.c
View file

@ -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;