#include <stdio.h>
#include "error_util.h"
#include "command-line-arguments.h"
+#include "string-util.h"
/*
Search the array of keywords for a given argument, assigning the
return FALSE;
}
+/*
+ An arguments composed of comma-separated flags is parsed and the
+ output variable is assigned the ORed flag values. Return FALSE in
+ case of error.
+*/
+static notmuch_bool_t
+_process_flags_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
+
+ const notmuch_keyword_t *keyword;
+ const char *flag = arg_str;
+ size_t flen = 0;
+ notmuch_bool_t match;
+
+ if (next == '\0' || *arg_str == '\0') {
+ /* No flag given */
+ fprintf (stderr, "Option \"%s\" needs an flags argument.\n", arg_desc->name);
+ return FALSE;
+ }
+
+ while ((flag = strtok_len_c (flag + flen, ",", &flen))) {
+ for (keyword = arg_desc->keywords, match = FALSE; keyword->name; keyword++) {
+ if (strncmp (flag, keyword->name, flen) == 0 &&
+ flen == strlen (keyword->name)) {
+ *((int *)arg_desc->output_var) |= keyword->value;
+ match = TRUE;
+ break;
+ }
+ }
+ if (! match) {
+ fprintf (stderr, "Unknown flag argument \"%.*s\" for option \"%s\".\n", (int)flen, flag, arg_desc->name);
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
+
+
static notmuch_bool_t
_process_boolean_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
switch (try->opt_type) {
case NOTMUCH_OPT_KEYWORD:
return _process_keyword_arg (try, next, value);
+ case NOTMUCH_OPT_FLAGS:
+ return _process_flags_arg (try, next, value);
case NOTMUCH_OPT_BOOLEAN:
return _process_boolean_arg (try, next, value);
case NOTMUCH_OPT_INT:
NOTMUCH_OPT_BOOLEAN, /* --verbose */
NOTMUCH_OPT_INT, /* --frob=8 */
NOTMUCH_OPT_KEYWORD, /* --format=raw|json|text */
+ NOTMUCH_OPT_FLAGS, /* --flags=name,addr,casefold */
NOTMUCH_OPT_STRING, /* --file=/tmp/gnarf.txt */
NOTMUCH_OPT_POSITION /* notmuch dump pos_arg */
};
smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
- $(call quiet,CC) $^ -o $@
+ $(call quiet,CC) $^ -o $@ -ltalloc
$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
$(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@
. ./test-lib.sh
test_begin_subtest "sanity check"
-$TEST_DIRECTORY/arg-test pos1 --keyword=one --string=foo pos2 --int=7 > OUTPUT
+$TEST_DIRECTORY/arg-test pos1 --keyword=one --flags=one,two --string=foo pos2 --int=7 > OUTPUT
cat <<EOF > EXPECTED
keyword 1
+flags 3
int 7
string foo
positional arg 1 pos1
int opt_index=1;
int kw_val=0;
+ int fl_val=0;
int int_val=0;
char *pos_arg1=NULL;
char *pos_arg2=NULL;
(notmuch_keyword_t []){ { "one", 1 },
{ "two", 2 },
{ 0, 0 } } },
+ { NOTMUCH_OPT_FLAGS, &fl_val, "flags", 'f',
+ (notmuch_keyword_t []){ { "one", 1 << 0},
+ { "two", 1 << 1 },
+ { 0, 0 } } },
{ NOTMUCH_OPT_INT, &int_val, "int", 'i', 0},
{ NOTMUCH_OPT_STRING, &string_val, "string", 's', 0},
{ NOTMUCH_OPT_POSITION, &pos_arg1, 0,0, 0},
if (kw_val)
printf("keyword %d\n", kw_val);
+ if (fl_val)
+ printf("flags %d\n", fl_val);
+
if (int_val)
printf("int %d\n", int_val);