OUTPUT_FILES,
};
-/* The following is to allow future options to be added more easily */
-enum {
- EXCLUDE_TRUE,
- EXCLUDE_FALSE,
-};
-
/* Return the number of files matching the query, or -1 for an error */
static int
count_files (notmuch_query_t *query)
case OUTPUT_FILES:
count = count_files (query);
if (count >= 0) {
- printf ("%u", count);
+ printf ("%d", count);
} else {
ret = -1;
goto DONE;
char *query_str;
int opt_index;
int output = OUTPUT_MESSAGES;
- int exclude = EXCLUDE_TRUE;
+ bool exclude = true;
const char **search_exclude_tags = NULL;
size_t search_exclude_tags_length = 0;
- notmuch_bool_t batch = FALSE;
- notmuch_bool_t print_lastmod = FALSE;
+ bool batch = false;
+ bool print_lastmod = false;
FILE *input = stdin;
- char *input_file_name = NULL;
+ const char *input_file_name = NULL;
int ret;
notmuch_opt_desc_t options[] = {
- { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',
+ { .opt_keyword = &output, .name = "output", .keywords =
(notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
{ "messages", OUTPUT_MESSAGES },
{ "files", OUTPUT_FILES },
{ 0, 0 } } },
- { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
- (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
- { "false", EXCLUDE_FALSE },
- { 0, 0 } } },
- { NOTMUCH_OPT_BOOLEAN, &print_lastmod, "lastmod", 'l', 0 },
- { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
- { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
- { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 },
- { 0, 0, 0, 0, 0 }
+ { .opt_bool = &exclude, .name = "exclude" },
+ { .opt_bool = &print_lastmod, .name = "lastmod" },
+ { .opt_bool = &batch, .name = "batch" },
+ { .opt_string = &input_file_name, .name = "input" },
+ { .opt_inherit = notmuch_shared_options },
+ { }
};
opt_index = parse_arguments (argc, argv, options, 1);
notmuch_process_shared_options (argv[0]);
if (input_file_name) {
- batch = TRUE;
+ batch = true;
input = fopen (input_file_name, "r");
if (input == NULL) {
fprintf (stderr, "Error opening %s for reading: %s\n",
if (batch && opt_index != argc) {
fprintf (stderr, "--batch and query string are not compatible\n");
+ if (input)
+ fclose (input);
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- if (exclude == EXCLUDE_TRUE) {
+ if (exclude) {
search_exclude_tags = notmuch_config_get_search_exclude_tags
(config, &search_exclude_tags_length);
}