*/
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) {
- *((int *)arg_desc->output_var) = keywords->value;
+ if (arg_desc->opt_type == NOTMUCH_OPT_KEYWORD_FLAGS)
+ *((int *)arg_desc->output_var) |= keywords->value;
+ else
+ *((int *)arg_desc->output_var) = keywords->value;
}
return TRUE;
}
keywords++;
}
- fprintf (stderr, "unknown keyword: %s\n", arg_str);
+ if (next != '\0')
+ fprintf (stderr, "Unknown keyword argument \"%s\" for option \"%s\".\n", arg_str, arg_desc->name);
+ else
+ fprintf (stderr, "Option \"%s\" needs a keyword argument.\n", arg_desc->name);
return FALSE;
}
static notmuch_bool_t
_process_boolean_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
- if (next == 0) {
+ if (next == '\0') {
*((notmuch_bool_t *)arg_desc->output_var) = TRUE;
return TRUE;
}
*((notmuch_bool_t *)arg_desc->output_var) = TRUE;
return TRUE;
}
+ fprintf (stderr, "Unknown argument \"%s\" for (boolean) option \"%s\".\n", arg_str, arg_desc->name);
+ return FALSE;
+}
+
+static notmuch_bool_t
+_process_int_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
+
+ char *endptr;
+ if (next == '\0' || arg_str[0] == '\0') {
+ fprintf (stderr, "Option \"%s\" needs an integer argument.\n", arg_desc->name);
+ return FALSE;
+ }
+
+ *((int *)arg_desc->output_var) = strtol (arg_str, &endptr, 10);
+ if (*endptr == '\0')
+ return TRUE;
+
+ fprintf (stderr, "Unable to parse argument \"%s\" for option \"%s\" as an integer.\n",
+ arg_str, arg_desc->name);
return FALSE;
}
+static notmuch_bool_t
+_process_string_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
+
+ if (next == '\0') {
+ fprintf (stderr, "Option \"%s\" needs a string argument.\n", arg_desc->name);
+ return FALSE;
+ }
+ if (arg_str[0] == '\0') {
+ 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;
+ return TRUE;
+}
+
/*
Search for the {pos_arg_index}th position argument, return FALSE if
that does not exist.
* 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);
+
+ const char *_arg = argv[opt_index];
- assert(arg);
+ assert(_arg);
assert(options);
- arg += 2;
-
- const notmuch_opt_desc_t *try = options;
- while (try->opt_type != NOTMUCH_OPT_END) {
- if (try->name && strncmp (arg, try->name, strlen (try->name)) == 0) {
- char next = arg[strlen (try->name)];
- const char *value= arg+strlen(try->name)+1;
-
- char *endptr;
-
- /* Everything but boolean arguments (switches) needs a
- * delimiter, and a non-zero length value. Boolean
- * arguments may take an optional =true or =false value.
- */
- if (next != '=' && next != ':' && next != 0) return FALSE;
- if (next == 0) {
- if (try->opt_type != NOTMUCH_OPT_BOOLEAN)
- return FALSE;
- } else {
- if (value[0] == 0) return FALSE;
- }
+ const char *arg = _arg + 2; /* _arg starts with -- */
+ const notmuch_opt_desc_t *try;
- 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, value);
- break;
- case NOTMUCH_OPT_BOOLEAN:
- return _process_boolean_arg (try, next, value);
- break;
- case NOTMUCH_OPT_INT:
- *((int *)try->output_var) = strtol (value, &endptr, 10);
- return (*endptr == 0);
- break;
- case NOTMUCH_OPT_STRING:
- *((const char **)try->output_var) = value;
- return TRUE;
- break;
- case NOTMUCH_OPT_POSITION:
- case NOTMUCH_OPT_END:
- default:
- INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type);
- /*UNREACHED*/
- }
+ 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; try->opt_type != NOTMUCH_OPT_END; try++) {
+ if (try->opt_type == NOTMUCH_OPT_INHERIT) {
+ int new_index = parse_option (argc, argv, try->output_var, opt_index);
+ if (new_index >= 0)
+ return new_index;
+ }
+
+ if (! try->name)
+ continue;
+
+ if (strncmp (arg, try->name, strlen (try->name)) != 0)
+ continue;
+
+ char next = arg[strlen (try->name)];
+ const char *value = arg + strlen(try->name) + 1;
+
+ /*
+ * If we have not reached the end of the argument (i.e. the
+ * next character is not a space or delimiter) then the
+ * argument could still match a longer option name later in
+ * the option table.
+ */
+ if (next != '=' && next != ':' && next != '\0')
+ continue;
+
+ if (next == '\0' && next_arg != NULL && try->opt_type != NOTMUCH_OPT_BOOLEAN) {
+ next = ' ';
+ value = next_arg;
+ opt_index ++;
+ }
+
+ if (try->output_var == NULL)
+ INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
+
+ notmuch_bool_t opt_status = FALSE;
+ switch (try->opt_type) {
+ case NOTMUCH_OPT_KEYWORD:
+ case NOTMUCH_OPT_KEYWORD_FLAGS:
+ opt_status = _process_keyword_arg (try, next, value);
+ break;
+ case NOTMUCH_OPT_BOOLEAN:
+ opt_status = _process_boolean_arg (try, next, value);
+ break;
+ case NOTMUCH_OPT_INT:
+ opt_status = _process_int_arg (try, next, value);
+ break;
+ case NOTMUCH_OPT_STRING:
+ opt_status = _process_string_arg (try, next, value);
+ break;
+ case NOTMUCH_OPT_POSITION:
+ case NOTMUCH_OPT_END:
+ default:
+ INTERNAL_ERROR ("unknown or unhandled option type %d", try->opt_type);
+ /*UNREACHED*/
}
- try++;
+ if (opt_status)
+ return opt_index+1;
+ else
+ return -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;
}
-
}
}