debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-search: convert to command-line-arguments

Browse source 
The switch on format_sel is slightly clunky, but it doesn't seem worth
special casing argument processing for function pointers, when I think
the function pointer approach will be modified/abandoned.
This commit is contained in:
David Bremner 2011-12-04 11:26:22 -04:00
parent a077d2b103
commit 5b3b1f44ed
1 changed files with 37 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
notmuch-search.c
View file

@ -417,81 +417,51 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
notmuch_database_t *notmuch; notmuch_database_t *notmuch;
notmuch_query_t *query; notmuch_query_t *query;
char *query_str; char *query_str;
char *opt;
notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST; notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
const search_format_t *format = &format_text; const search_format_t *format = &format_text;
int i, ret; int opt_index, ret;
output_t output = OUTPUT_SUMMARY; output_t output = OUTPUT_SUMMARY;
int offset = 0; int offset = 0;
int limit = -1; /* unlimited */ int limit = -1; /* unlimited */
argc--; argv++; /* skip subcommand argument */ enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT }
format_sel = NOTMUCH_FORMAT_TEXT;
for (i = 0; i < argc && argv[i][0] == '-'; i++) { notmuch_opt_desc_t options[] = {
if (strcmp (argv[i], "--") == 0) { { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',
i++; (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },
break; { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },
} { 0, 0 } } },
if (STRNCMP_LITERAL (argv[i], "--sort=") == 0) { { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',
opt = argv[i] + sizeof ("--sort=") - 1; (notmuch_keyword_t []){ { "json", NOTMUCH_FORMAT_JSON },
if (strcmp (opt, "oldest-first") == 0) { { "text", NOTMUCH_FORMAT_TEXT },
sort = NOTMUCH_SORT_OLDEST_FIRST; { 0, 0 } } },
} else if (strcmp (opt, "newest-first") == 0) { { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
sort = NOTMUCH_SORT_NEWEST_FIRST; (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY },
} else { { "threads", OUTPUT_THREADS },
fprintf (stderr, "Invalid value for --sort: %s\n", opt); { "messages", OUTPUT_MESSAGES },
return 1; { "files", OUTPUT_FILES },
} { "tags", OUTPUT_TAGS },
} else if (STRNCMP_LITERAL (argv[i], "--offset=") == 0) { { 0, 0 } } },
char *p; { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },
opt = argv[i] + sizeof ("--offset=") - 1; { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },
offset = strtol (opt, &p, 10); { 0, 0, 0, 0, 0 }
if (*opt == '\0' || p == opt || *p != '\0') { };
fprintf (stderr, "Invalid value for --offset: %s\n", opt);
return 1; opt_index = parse_arguments (argc, argv, options, 1);
}
} else if (STRNCMP_LITERAL (argv[i], "--limit=") == 0) { if (opt_index < 0) {
char *p; return 1;
opt = argv[i] + sizeof ("--limit=") - 1;
limit = strtoul (opt, &p, 10);
if (*opt == '\0' || p == opt || *p != '\0') {
fprintf (stderr, "Invalid value for --limit: %s\n", opt);
return 1;
}
} else if (STRNCMP_LITERAL (argv[i], "--format=") == 0) {
opt = argv[i] + sizeof ("--format=") - 1;
if (strcmp (opt, "text") == 0) {
format = &format_text;
} else if (strcmp (opt, "json") == 0) {
format = &format_json;
} else {
fprintf (stderr, "Invalid value for --format: %s\n", opt);
return 1;
}
} else if (STRNCMP_LITERAL (argv[i], "--output=") == 0) {
opt = argv[i] + sizeof ("--output=") - 1;
if (strcmp (opt, "summary") == 0) {
output = OUTPUT_SUMMARY;
} else if (strcmp (opt, "threads") == 0) {
output = OUTPUT_THREADS;
} else if (strcmp (opt, "messages") == 0) {
output = OUTPUT_MESSAGES;
} else if (strcmp (opt, "files") == 0) {
output = OUTPUT_FILES;
} else if (strcmp (opt, "tags") == 0) {
output = OUTPUT_TAGS;
} else {
fprintf (stderr, "Invalid value for --output: %s\n", opt);
return 1;
}
} else {
fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
return 1;
}
} }
argc -= i; switch (format_sel) {
argv += i; case NOTMUCH_FORMAT_TEXT:
format = &format_text;
break;
case NOTMUCH_FORMAT_JSON:
format = &format_json;
break;
}
config = notmuch_config_open (ctx, NULL, NULL); config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL) if (config == NULL)
@ -502,7 +472,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])
if (notmuch == NULL) if (notmuch == NULL)
return 1; return 1;
query_str = query_string_from_args (notmuch, argc, argv); query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index);
if (query_str == NULL) { if (query_str == NULL) {
fprintf (stderr, "Out of memory.\n"); fprintf (stderr, "Out of memory.\n");
return 1; return 1;