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;
- const char **auto_exclude_tags;
- size_t auto_exclude_tags_length;
+ 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_KEYWORD, &exclude, "exclude", 'x',
+ (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
+ { "false", EXCLUDE_FALSE },
+ { 0, 0 } } },
{ 0, 0, 0, 0, 0 }
};
return 1;
}
- auto_exclude_tags = notmuch_config_get_auto_exclude_tags
- (config, &auto_exclude_tags_length);
- for (i = 0; i < auto_exclude_tags_length; i++)
- notmuch_query_add_tag_exclude (query, auto_exclude_tags[i]);
+ if (exclude == EXCLUDE_TRUE) {
+ const char **search_exclude_tags;
+ size_t search_exclude_tags_length;
+
+ search_exclude_tags = notmuch_config_get_search_exclude_tags
+ (config, &search_exclude_tags_length);
+ for (i = 0; i < search_exclude_tags_length; i++)
+ notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);
+ }
switch (output) {
case OUTPUT_MESSAGES:
}
notmuch_query_destroy (query);
- notmuch_database_close (notmuch);
+ notmuch_database_destroy (notmuch);
return 0;
}