devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 01:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for duplicate options in option parser

Browse Source
This commit is contained in:
James Booth
2014-04-14 23:01:57 +01:00
parent 8d77930ece
commit 2419737006
4 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/tools/parser.c
View File

@@ -385,14 +385,31 @@ parse_options(gchar **args, int start, GList *keys, gboolean *res)
return options;
}
// check each option is valid and has value, failure if not
// validate options
int curr;
GList *found_keys = NULL;
for (curr = start; curr < g_strv_length(args); curr+= 2) {
if ((g_list_find(keys, args[curr]) == NULL) || (args[curr+1] == NULL)) {
// check if option valid
if (g_list_find(keys, args[curr]) == NULL) {
*res = FALSE;
return options;
}
// check if duplicate
if (g_list_find(found_keys, args[curr]) != NULL) {
*res = FALSE;
return options;
}
// check value given
if (args[curr+1] == NULL) {
*res = FALSE;
return options;
}
found_keys = g_list_append(found_keys, args[curr]);
}
g_list_free(found_keys);
// create map
options = g_hash_table_new(g_str_hash, g_str_equal);