bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use strtok_r to parse multi-value config options

Browse source 
This prevents multiple spaces between values from being
parsed as empty values.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-02-02 10:16:19 -05:00 • committed by Allan McRae
parent ec339969d9
commit 1631255357
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pacman/conf.c
View file

@ -404,17 +404,14 @@ static int process_cleanmethods(alpm_list_t *values,
static void setrepeatingoption(char *ptr, const char *option,
alpm_list_t **list)
{
char *q;
char *val, *saveptr;
while((q = strchr(ptr, ' '))) {
*q = '\0';
*list = alpm_list_add(*list, strdup(ptr));
pm_printf(ALPM_LOG_DEBUG, "config: %s: %s\n", option, ptr);
ptr = q;
ptr++;
val = strtok_r(ptr, " ", &saveptr);
while(val) {
*list = alpm_list_add(*list, strdup(val));
pm_printf(ALPM_LOG_DEBUG, "config: %s: %s\n", option, val);
val = strtok_r(NULL, " ", &saveptr);
}
*list = alpm_list_add(*list, strdup(ptr));
pm_printf(ALPM_LOG_DEBUG, "config: %s: %s\n", option, ptr);
}
static int _parse_options(const char *key, char *value,