X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-count.c;h=0d700a9e12f8205fbe92f3309cb162dd7cc15d95;hb=5964a760a5d26f94ea1c262a25f80725877e3445;hp=97242abaa778b00764264a0c396e65f6be75e188;hpb=b15a03fafc2e313264519f030e45ea203af508e2;p=notmuch

diff --git a/notmuch-count.c b/notmuch-count.c
index 97242aba..0d700a9e 100644
--- a/notmuch-count.c
+++ b/notmuch-count.c
@@ -35,6 +35,8 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
     notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;
 #endif
 
+    argc--; argv++; /* skip subcommand argument */
+
     for (i = 0; i < argc && argv[i][0] == '-'; i++) {
 	if (strcmp (argv[i], "--") == 0) {
 	    i++;
@@ -90,7 +92,8 @@ notmuch_count_command (void *ctx, int argc, char *argv[])
 	fprintf (stderr, "Out of memory.\n");
 	return 1;
     }
-    if (*query_str == '\0' || (*query_str == '*' && *(query_str+1) == '\0')) {
+
+    if (*query_str == '\0') {
 	query_str = talloc_strdup (ctx, "");
     }