giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: ignore non 'auto-configurated' values

Browse Source 
When getting string configuration parameter,
ignore non 'auto-configurated' in configuration file value
(ex. @SOME_VALUE_IN_OPENSC_CONF@) and return it's default value.
This commit is contained in:
Viktor Tarasov 2012-06-07 22:35:30 +02:00
parent 7c05e8ce21
commit 73f324010e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/scconf/scconf.c
View File

@ -125,15 +125,12 @@ const scconf_list *scconf_find_list(const scconf_block * block, const char *opti
{
scconf_item *item;
if (!block) {
if (!block)
return NULL;
}
for (item = block->items; item; item = item->next) {
if (item->type == SCCONF_ITEM_TYPE_VALUE &&
strcasecmp(option, item->key) == 0) {
for (item = block->items; item; item = item->next)
if (item->type == SCCONF_ITEM_TYPE_VALUE && strcasecmp(option, item->key) == 0)
return item->value.list;
}
}
return NULL;
}
@ -142,7 +139,14 @@ const char *scconf_get_str(const scconf_block * block, const char *option, const
const scconf_list *list;
list = scconf_find_list(block, option);
return !list ? def : list->data;
if (!list)
return def;
/* ignore non 'auto-configurated' values */
if (*list->data == '@' && *(list->data + strlen(list->data) - 1) == '@')
return def;
return list->data;
}
int scconf_get_int(const scconf_block * block, const char *option, int def)