mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-12-31 17:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[common] options: trim whitespace from option values

Browse source 
This closes #1071
This commit is contained in:
Geoffrey McRae 2023-05-02 12:27:17 +10:00
parent dab5618a6d
commit 07bcc54732
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
common/src/option.c
View file

@ -346,8 +346,18 @@ bool option_parse(int argc, char * argv[])
o = state.options[i];
if (o->type != OPTION_TYPE_BOOL && a < argc - 1)
{
++a;
value = strdup(argv[a]);
char * v = argv[a];
//ltrim
while(*v && isspace(*v))
++v;
int valueLen = strlen(v);
//rtrim
while (valueLen > 1 && isspace(v[valueLen-1]))
--valueLen;
value = strndup(v, valueLen);
}
break;
}
@ -369,7 +379,18 @@ bool option_parse(int argc, char * argv[])
o = option_get(module, name);
if (value)
value = strdup(value);
{
//ltrim
while(*value && isspace(*value))
++value;
int valueLen = strlen(value);
//rtrim
while (valueLen > 1 && isspace(value[valueLen-1]))
--valueLen;
value = strndup(value, valueLen);
}
free(arg);
}
@ -458,7 +479,13 @@ static bool process_option_line(const char * module, const char * name,
else
{
if (value)
{
//rtrim
while (valueLen > 1 && isspace(name[valueLen-1]))
--valueLen;
value[valueLen] = '\0';
}
if (!option_set(o, value))
DEBUG_ERROR("Failed to set the option value");