OUTPUT_MESSAGES,
};
+/* The following is to allow future options to be added more easily */
+enum {
+ EXCLUDE_TRUE,
+ EXCLUDE_FALSE,
+};
+
int
notmuch_count_command (void *ctx, int argc, char *argv[])
{
char *query_str;
int opt_index;
int output = OUTPUT_MESSAGES;
- notmuch_bool_t no_exclude = FALSE;
+ int exclude = EXCLUDE_TRUE;
unsigned int i;
notmuch_opt_desc_t options[] = {
(notmuch_keyword_t []){ { "threads", OUTPUT_THREADS },
{ "messages", OUTPUT_MESSAGES },
{ 0, 0 } } },
- { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 },
+ { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
+ (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
+ { "false", EXCLUDE_FALSE },
+ { 0, 0 } } },
{ 0, 0, 0, 0, 0 }
};
if (config == NULL)
return 1;
- notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
- NOTMUCH_DATABASE_MODE_READ_ONLY);
- if (notmuch == NULL)
+ if (notmuch_database_open (notmuch_config_get_database_path (config),
+ NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much))
return 1;
query_str = query_string_from_args (ctx, argc-opt_index, argv+opt_index);
return 1;
}
- if (!no_exclude) {
+ if (exclude == EXCLUDE_TRUE) {
const char **search_exclude_tags;
size_t search_exclude_tags_length;
notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
}
- notmuch_query_set_omit_excluded_messages (query, TRUE);
-
switch (output) {
case OUTPUT_MESSAGES:
printf ("%u\n", notmuch_query_count_messages (query));
}
notmuch_query_destroy (query);
- notmuch_database_close (notmuch);
+ notmuch_database_destroy (notmuch);
return 0;
}