while (keywords->name) {
if (strcmp (arg_str, keywords->name) == 0) {
- if (arg_desc->output_var) {
- *((int *)arg_desc->output_var) = keywords->value;
- }
+ if (arg_desc->opt_flags)
+ *arg_desc->opt_flags |= keywords->value;
+ else
+ *arg_desc->opt_keyword = keywords->value;
return TRUE;
}
keywords++;
_process_boolean_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
if (next == '\0') {
- *((notmuch_bool_t *)arg_desc->output_var) = TRUE;
+ *arg_desc->opt_bool = TRUE;
return TRUE;
}
if (strcmp (arg_str, "false") == 0) {
- *((notmuch_bool_t *)arg_desc->output_var) = FALSE;
+ *arg_desc->opt_bool = FALSE;
return TRUE;
}
if (strcmp (arg_str, "true") == 0) {
- *((notmuch_bool_t *)arg_desc->output_var) = TRUE;
+ *arg_desc->opt_bool = TRUE;
return TRUE;
}
fprintf (stderr, "Unknown argument \"%s\" for (boolean) option \"%s\".\n", arg_str, arg_desc->name);
return FALSE;
}
- *((int *)arg_desc->output_var) = strtol (arg_str, &endptr, 10);
+ *arg_desc->opt_int = strtol (arg_str, &endptr, 10);
if (*endptr == '\0')
return TRUE;
fprintf (stderr, "String argument for option \"%s\" must be non-empty.\n", arg_desc->name);
return FALSE;
}
- *((const char **)arg_desc->output_var) = arg_str;
+ *arg_desc->opt_string = arg_str;
return TRUE;
}
+/* Return number of non-NULL opt_* fields in opt_desc. */
+static int _opt_set_count (const notmuch_opt_desc_t *opt_desc)
+{
+ return
+ !!opt_desc->opt_inherit +
+ !!opt_desc->opt_bool +
+ !!opt_desc->opt_int +
+ !!opt_desc->opt_keyword +
+ !!opt_desc->opt_flags +
+ !!opt_desc->opt_string +
+ !!opt_desc->opt_position;
+}
+
+/* Return TRUE if opt_desc is valid. */
+static notmuch_bool_t _opt_valid (const notmuch_opt_desc_t *opt_desc)
+{
+ int n = _opt_set_count (opt_desc);
+
+ if (n > 1)
+ INTERNAL_ERROR ("more than one non-NULL opt_* field for argument \"%s\"",
+ opt_desc->name);
+
+ return n > 0;
+}
+
/*
Search for the {pos_arg_index}th position argument, return FALSE if
that does not exist.
const notmuch_opt_desc_t *arg_desc) {
int pos_arg_counter = 0;
- while (arg_desc->opt_type != NOTMUCH_OPT_END){
- if (arg_desc->opt_type == NOTMUCH_OPT_POSITION) {
+ while (_opt_valid (arg_desc)) {
+ if (arg_desc->opt_position) {
if (pos_arg_counter == pos_arg_index) {
- if (arg_desc->output_var) {
- *((const char **)arg_desc->output_var) = arg_str;
- }
+ *arg_desc->opt_position = arg_str;
+ if (arg_desc->present)
+ *arg_desc->present = TRUE;
return TRUE;
}
pos_arg_counter++;
* parse a possible value, and assign to *output_var
*/
-notmuch_bool_t
-parse_option (const char *arg,
- const notmuch_opt_desc_t *options) {
+int
+parse_option (int argc, char **argv, const notmuch_opt_desc_t *options, int opt_index)
+{
+ assert(argv);
- assert(arg);
- assert(options);
+ const char *_arg = argv[opt_index];
- arg += 2;
+ assert(_arg);
+ assert(options);
+ const char *arg = _arg + 2; /* _arg starts with -- */
const notmuch_opt_desc_t *try;
- for (try = options; try->opt_type != NOTMUCH_OPT_END; try++) {
+
+ const char *next_arg = NULL;
+ if (opt_index < argc - 1 && strncmp (argv[opt_index + 1], "--", 2) != 0)
+ next_arg = argv[opt_index + 1];
+
+ for (try = options; _opt_valid (try); try++) {
+ if (try->opt_inherit) {
+ int new_index = parse_option (argc, argv, try->opt_inherit, opt_index);
+ if (new_index >= 0)
+ return new_index;
+ }
+
if (! try->name)
continue;
if (next != '=' && next != ':' && next != '\0')
continue;
- if (try->output_var == NULL)
- INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
-
- switch (try->opt_type) {
- case NOTMUCH_OPT_KEYWORD:
- return _process_keyword_arg (try, next, value);
- case NOTMUCH_OPT_BOOLEAN:
- return _process_boolean_arg (try, next, value);
- case NOTMUCH_OPT_INT:
- return _process_int_arg (try, next, value);
- case NOTMUCH_OPT_STRING:
- return _process_string_arg (try, next, value);
- case NOTMUCH_OPT_POSITION:
- case NOTMUCH_OPT_END:
- default:
- INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type);
- /*UNREACHED*/
+ if (next == '\0' && next_arg != NULL && ! try->opt_bool) {
+ next = ' ';
+ value = next_arg;
+ opt_index ++;
}
+
+ notmuch_bool_t opt_status = FALSE;
+ if (try->opt_keyword || try->opt_flags)
+ opt_status = _process_keyword_arg (try, next, value);
+ else if (try->opt_bool)
+ opt_status = _process_boolean_arg (try, next, value);
+ else if (try->opt_int)
+ opt_status = _process_int_arg (try, next, value);
+ else if (try->opt_string)
+ opt_status = _process_string_arg (try, next, value);
+ else
+ INTERNAL_ERROR ("unknown or unhandled option \"%s\"", try->name);
+
+ if (! opt_status)
+ return -1;
+
+ if (try->present)
+ *try->present = TRUE;
+
+ return opt_index+1;
}
- fprintf (stderr, "Unrecognized option: --%s\n", arg);
- return FALSE;
+ return -1;
}
/* See command-line-arguments.h for description */
}
} else {
+ int prev_opt_index = opt_index;
if (strlen (argv[opt_index]) == 2)
return opt_index+1;
- more_args = parse_option (argv[opt_index], options);
- if (more_args) {
- opt_index++;
- } else {
- opt_index = -1;
+ opt_index = parse_option (argc, argv, options, opt_index);
+ if (opt_index < 0) {
+ fprintf (stderr, "Unrecognized option: %s\n", argv[prev_opt_index]);
+ more_args = FALSE;
}
-
}
}
projects / notmuch / blobdiff