mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-21 10:28:09 +01:00
4a6721970a
Several changes at once, just to not have to change the same lines
several times over:
- Use designated initializers to initialize opt desc arrays.
- Only initialize the needed fields.
- Remove arg_id (short options) as unused.
- Replace opt_type and output_var with several type safe output
variables, where the output variable being non-NULL determines the
type. Introduce checks to ensure only one is set. The downside is
some waste of const space per argument; this could be saved by
retaining opt_type and using a union, but that's still pretty
verbose.
- Fix some variables due to the type safety. Mostly a good thing, but
leads to some enums being changed to ints. This is pedantically
correct, but somewhat annoying. We could also cast, but that defeats
the purpose a bit.
- Terminate the opt desc arrays using {}.
The output variable type safety and the ability to add new fields for
just some output types or arguments are the big wins. For example, if
we wanted to add a variable to set when the argument is present, we
could do so for just the arguments that need it.
Beauty is in the eye of the beholder, but I think this looks nice when
defining the arguments, and reduces some of the verbosity we have
there.
70 lines
1.8 KiB
C
70 lines
1.8 KiB
C
#ifndef NOTMUCH_OPTS_H
|
|
#define NOTMUCH_OPTS_H
|
|
|
|
#include "notmuch.h"
|
|
|
|
/*
|
|
* Describe one of the possibilities for a keyword option
|
|
* 'value' will be copied to the output variable
|
|
*/
|
|
|
|
typedef struct notmuch_keyword {
|
|
const char *name;
|
|
int value;
|
|
} notmuch_keyword_t;
|
|
|
|
/* Describe one option. */
|
|
typedef struct notmuch_opt_desc {
|
|
/* One and only one of opt_* must be set. */
|
|
const struct notmuch_opt_desc *opt_inherit;
|
|
notmuch_bool_t *opt_bool;
|
|
int *opt_int;
|
|
int *opt_keyword;
|
|
int *opt_flags;
|
|
const char **opt_string;
|
|
const char **opt_position;
|
|
|
|
/* Must be set except for opt_inherit and opt_position. */
|
|
const char *name;
|
|
|
|
/* Must be set for opt_keyword and opt_flags. */
|
|
const struct notmuch_keyword *keywords;
|
|
} notmuch_opt_desc_t;
|
|
|
|
|
|
/*
|
|
This is the main entry point for command line argument parsing.
|
|
|
|
Parse command line arguments according to structure options,
|
|
starting at position opt_index.
|
|
|
|
All output of parsed values is via pointers in options.
|
|
|
|
Parsing stops at -- (consumed) or at the (k+1)st argument
|
|
not starting with -- (a "positional argument") if options contains
|
|
k positional argument descriptors.
|
|
|
|
Returns the index of first non-parsed argument, or -1 in case of error.
|
|
|
|
*/
|
|
int
|
|
parse_arguments (int argc, char **argv, const notmuch_opt_desc_t *options, int opt_index);
|
|
|
|
/*
|
|
* If the argument parsing loop provided by parse_arguments is not
|
|
* flexible enough, then the user might be interested in the following
|
|
* routines, but note that the API to parse_option might have to
|
|
* change. See command-line-arguments.c for descriptions of these
|
|
* functions.
|
|
*/
|
|
|
|
int
|
|
parse_option (int argc, char **argv, const notmuch_opt_desc_t* options, int opt_index);
|
|
|
|
notmuch_bool_t
|
|
parse_position_arg (const char *arg,
|
|
int position_arg_index,
|
|
const notmuch_opt_desc_t* options);
|
|
|
|
|
|
#endif
|