From 394cb1c46d91a1bb28df9cc4a563e1115cc9af34 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 18 Nov 2009 13:43:38 -0800 Subject: Make reply/show/tag all require at least one search term In particular, notmuch tag -inbox "" tended to take a long time to run, happened if you hit 'a' on a blank line in the search view and probably didn't have the desired effect. Signed-off-by: Keith Packard --- notmuch-tag.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'notmuch-tag.c') diff --git a/notmuch-tag.c b/notmuch-tag.c index 7d92ec48..12ab86c5 100644 --- a/notmuch-tag.c +++ b/notmuch-tag.c @@ -83,8 +83,10 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } - if (i == argc) { - fprintf (stderr, "Error: 'notmuch tag' requires at least one search term.\n"); + query_string = query_string_from_args (ctx, argc - i, &argv[i]); + + if (*query_string == '\0') { + fprintf (stderr, "Error: notmuch tag requires at least one search term.\n"); return 1; } @@ -96,8 +98,6 @@ notmuch_tag_command (void *ctx, unused (int argc), unused (char *argv[])) if (notmuch == NULL) return 1; - query_string = query_string_from_args (ctx, argc - i, &argv[i]); - query = notmuch_query_create (notmuch, query_string); if (query == NULL) { fprintf (stderr, "Out of memory.\n"); -- cgit v1.2.3