debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-03 07:11:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: command line parsing: allow default for keyword options

Browse source 
This changes the parsing for "keyword" options so that if the option
is specified with no argument the argument is parsed as if it were
passed an empty string. This make it easier to add options to existing
boolean arguments (the existing --option can default to TRUE).
This commit is contained in:
Mark Walters 2012-06-16 11:21:42 +01:00 committed by David Bremner
parent d796dad4ed
commit 779ce3e930
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
command-line-arguments.c
View file

@ -11,10 +11,15 @@
*/
static notmuch_bool_t
_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
const notmuch_keyword_t *keywords = arg_desc->keywords;
if (next == 0) {
/* No keyword given */
arg_str = "";
}
while (keywords->name) {
if (strcmp (arg_str, keywords->name) == 0) {
if (arg_desc->output_var) {
@ -24,7 +29,10 @@ _process_keyword_arg (const notmuch_opt_desc_t *arg_desc, const char *arg_str) {
}
keywords++;
}
if (next != 0)
fprintf (stderr, "unknown keyword: %s\n", arg_str);
else
fprintf (stderr, "option %s needs a keyword\n", arg_desc->name);
return FALSE;
}
@ -99,7 +107,8 @@ parse_option (const char *arg,
*/
if (next != '=' && next != ':' && next != 0) return FALSE;
if (next == 0) {
if (try->opt_type != NOTMUCH_OPT_BOOLEAN)
if (try->opt_type != NOTMUCH_OPT_BOOLEAN &&
try->opt_type != NOTMUCH_OPT_KEYWORD)
return FALSE;
} else {
if (value[0] == 0) return FALSE;
@ -110,7 +119,7 @@ parse_option (const char *arg,
switch (try->opt_type) {
case NOTMUCH_OPT_KEYWORD:
return _process_keyword_arg (try, value);
return _process_keyword_arg (try, next, value);
break;
case NOTMUCH_OPT_BOOLEAN:
return _process_boolean_arg (try, next, value);