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

tokenize: strdup() each individual argv

Browse source 
Instead of referencing the un-tokenized “raw” command string, strdup()
each argv. This way, the input string can be ‘const’.
This commit is contained in:
Daniel Eklöf 2021-06-20 14:17:31 +02:00
parent 7632e16e36
commit 42ec264075
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 56 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tokenize.c
View file

@ -6,9 +6,10 @@
#define LOG_MODULE "tokenize"
#define LOG_ENABLE_DBG 0
#include "log.h"
#include "xmalloc.h"
static bool
push_argv(char ***argv, size_t *size, char *arg, size_t *argc)
push_argv(char ***argv, size_t *size, const char *arg, size_t len, size_t *argc)
{
if (arg != NULL && arg[0] == '%')
return true;
@ -24,21 +25,23 @@ push_argv(char ***argv, size_t *size, char *arg, size_t *argc)
*size = new_size;
}
(*argv)[(*argc)++] = arg;
(*argv)[(*argc)++] = arg != NULL ? xstrndup(arg, len) : NULL;
return true;
}
bool
tokenize_cmdline(char *cmdline, char ***argv)
tokenize_cmdline(const char *cmdline, char ***argv)
{
*argv = NULL;
size_t argv_size = 0;
const char *final_end = cmdline + strlen(cmdline) + 1;
bool first_token_is_quoted = cmdline[0] == '"' || cmdline[0] == '\'';
char delim = first_token_is_quoted ? cmdline[0] : ' ';
char *p = first_token_is_quoted ? &cmdline[1] : &cmdline[0];
char *search_start = p;
const char *p = first_token_is_quoted ? &cmdline[1] : &cmdline[0];
const char *search_start = p;
size_t idx = 0;
while (*p != '\0') {
@ -51,8 +54,8 @@ tokenize_cmdline(char *cmdline, char ***argv)
return false;
}
if (!push_argv(argv, &argv_size, p, &idx) ||
!push_argv(argv, &argv_size, NULL, &idx))
if (!push_argv(argv, &argv_size, p, final_end - p, &idx) ||
!push_argv(argv, &argv_size, NULL, 0, &idx))
{
goto err;
} else
@ -68,9 +71,9 @@ tokenize_cmdline(char *cmdline, char ***argv)
continue;
}
*end = '\0';
//*end = '\0';
if (!push_argv(argv, &argv_size, p, &idx))
if (!push_argv(argv, &argv_size, p, end - p, &idx))
goto err;
p = end + 1;
@ -88,7 +91,7 @@ tokenize_cmdline(char *cmdline, char ***argv)
search_start = p;
}
if (!push_argv(argv, &argv_size, NULL, &idx))
if (!push_argv(argv, &argv_size, NULL, 0, &idx))
goto err;
return true;