/*
Search the array of keywords for a given argument, assigning the
- output variable to the corresponding value. Return FALSE if nothing
+ output variable to the corresponding value. Return false if nothing
matches.
*/
-static notmuch_bool_t
+static bool
_process_keyword_arg (const notmuch_opt_desc_t *arg_desc, char next, const char *arg_str) {
- const notmuch_keyword_t *keywords = arg_desc->keywords;
+ const notmuch_keyword_t *keywords;
if (next == '\0') {
/* No keyword given */
arg_str = "";
}
- while (keywords->name) {
- if (strcmp (arg_str, keywords->name) == 0) {
- if (arg_desc->output_var) {
- 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++;
+ for (keywords = arg_desc->keywords; keywords->name; keywords++) {
+ if (strcmp (arg_str, keywords->name) != 0)
+ continue;
+
+ if (arg_desc->opt_flags)
+ *arg_desc->opt_flags |= keywords->value;
+ else
+ *arg_desc->opt_keyword = keywords->value;
+
+ return true;
}
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;
+ return false;
}
-static notmuch_bool_t
+static bool
_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;
- return TRUE;
- }
- if (strcmp (arg_str, "false") == 0) {
- *((notmuch_bool_t *)arg_desc->output_var) = FALSE;
- return TRUE;
+ bool value;
+
+ if (next == '\0' || strcmp (arg_str, "true") == 0) {
+ value = true;
+ } else if (strcmp (arg_str, "false") == 0) {
+ value = false;
+ } else {
+ fprintf (stderr, "Unknown argument \"%s\" for (boolean) option \"%s\".\n", arg_str, arg_desc->name);
+ return false;
}
- if (strcmp (arg_str, "true") == 0) {
- *((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;
+
+ *arg_desc->opt_bool = value;
+
+ return true;
}
-static notmuch_bool_t
+static bool
_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;
+ 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;
+ return true;
fprintf (stderr, "Unable to parse argument \"%s\" for option \"%s\" as an integer.\n",
arg_str, arg_desc->name);
- return FALSE;
+ return false;
}
-static notmuch_bool_t
+static bool
_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;
+ return false;
}
- if (arg_str[0] == '\0') {
+ if (arg_str[0] == '\0' && ! arg_desc->allow_empty) {
fprintf (stderr, "String argument for option \"%s\" must be non-empty.\n", arg_desc->name);
- return FALSE;
+ return false;
}
- *((const char **)arg_desc->output_var) = arg_str;
- return TRUE;
+ *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 bool _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
+ Search for the {pos_arg_index}th position argument, return false if
that does not exist.
*/
-notmuch_bool_t
+bool
parse_position_arg (const char *arg_str, int pos_arg_index,
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;
- }
- return TRUE;
+ *arg_desc->opt_position = arg_str;
+ if (arg_desc->present)
+ *arg_desc->present = true;
+ return true;
}
pos_arg_counter++;
}
arg_desc++;
}
- return FALSE;
+ return false;
}
/*
const char *arg = _arg + 2; /* _arg starts with -- */
const notmuch_opt_desc_t *try;
- 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);
+
+ 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 (next != '=' && next != ':' && next != '\0')
continue;
- if (try->output_var == NULL)
- INTERNAL_ERROR ("output pointer NULL for option %s", try->name);
+ if (next == '\0' && next_arg != NULL && ! try->opt_bool) {
+ next = ' ';
+ value = next_arg;
+ opt_index ++;
+ }
- notmuch_bool_t opt_status = FALSE;
- switch (try->opt_type) {
- case NOTMUCH_OPT_KEYWORD:
- case NOTMUCH_OPT_KEYWORD_FLAGS:
+ bool opt_status = false;
+ if (try->opt_keyword || try->opt_flags)
opt_status = _process_keyword_arg (try, next, value);
- break;
- case NOTMUCH_OPT_BOOLEAN:
+ else if (try->opt_bool)
opt_status = _process_boolean_arg (try, next, value);
- break;
- case NOTMUCH_OPT_INT:
+ else if (try->opt_int)
opt_status = _process_int_arg (try, next, value);
- break;
- case NOTMUCH_OPT_STRING:
+ else if (try->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*/
- }
- if (opt_status)
- return opt_index+1;
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;
}
return -1;
}
const notmuch_opt_desc_t *options, int opt_index) {
int pos_arg_index = 0;
- notmuch_bool_t more_args = TRUE;
+ bool more_args = true;
while (more_args && opt_index < argc) {
if (strncmp (argv[opt_index],"--",2) != 0) {
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;
+ more_args = false;
}
}
}
projects / notmuch / blobdiff