debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2025-01-08 17:51:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI: convert top level argument parsing to use command-line-arguments

Browse source 
This isn't really a win for conciseness yet, but will make it easier
to add options.
This commit is contained in:
David Bremner 2013-01-19 14:25:54 -04:00
parent a76682a2d2
commit 0fa4ded8e5
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
notmuch.c
View file

@ -249,6 +249,14 @@ main (int argc, char *argv[])
void *local; void *local;
command_t *command; command_t *command;
unsigned int i; unsigned int i;
notmuch_bool_t print_help=FALSE, print_version=FALSE;
int opt_index;
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },
{ NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },
{ 0, 0, 0, 0, 0 }
};
talloc_enable_null_tracking (); talloc_enable_null_tracking ();
@ -263,10 +271,16 @@ main (int argc, char *argv[])
if (argc == 1) if (argc == 1)
return notmuch (local); return notmuch (local);
if (strcmp (argv[1], "--help") == 0) opt_index = parse_arguments (argc, argv, options, 1);
if (opt_index < 0) {
/* diagnostics already printed */
return 1;
}
if (print_help)
return notmuch_help_command (NULL, argc - 1, &argv[1]); return notmuch_help_command (NULL, argc - 1, &argv[1]);
if (strcmp (argv[1], "--version") == 0) { if (print_version) {
printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n"); printf ("notmuch " STRINGIFY(NOTMUCH_VERSION) "\n");
return 0; return 0;
} }
@ -274,11 +288,11 @@ main (int argc, char *argv[])
for (i = 0; i < ARRAY_SIZE (commands); i++) { for (i = 0; i < ARRAY_SIZE (commands); i++) {
command = &commands[i]; command = &commands[i];
if (strcmp (argv[1], command->name) == 0) { if (strcmp (argv[opt_index], command->name) == 0) {
int ret; int ret;
char *talloc_report; char *talloc_report;
ret = (command->function)(local, argc - 1, &argv[1]); ret = (command->function)(local, argc - opt_index, argv + opt_index);
/* in the future support for this environment variable may /* in the future support for this environment variable may
* be supplemented or replaced by command line arguments * be supplemented or replaced by command line arguments