X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-tag.c;h=d15f1eda481fe0a6931afbb61de38289249642db;hp=05feed3e97a461f7201ca0b2d0664cc5e3743586;hb=c158201ee217740cb1b64858df8c7d39cf7793d0;hpb=9605e62099b8c5d9e1debc27b31ae1e256703a3b

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 05feed3e..d15f1eda 100644
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -203,6 +203,17 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
 	    break;
 	}
 	if (argv[i][0] == '+' || argv[i][0] == '-') {
+	    if (argv[i][0] == '+' && argv[i][1] == '\0') {
+		fprintf(stderr, "Error: tag names cannot be empty.\n");
+		return 1;
+	    }
+	    if (argv[i][0] == '+' && argv[i][1] == '-') {
+		/* This disallows adding the non-removable tag "-" and
+		 * enables notmuch tag to take long options in the
+		 * future. */
+		fprintf(stderr, "Error: tag names must not start with '-'.\n");
+		return 1;
+	    }
 	    tag_ops[tag_ops_count].tag = argv[i] + 1;
 	    tag_ops[tag_ops_count].remove = (argv[i][0] == '-');
 	    tag_ops_count++;
@@ -229,16 +240,15 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
     if (config == NULL)
 	return 1;
 
-    notmuch = notmuch_database_open (notmuch_config_get_database_path (config),
-				     NOTMUCH_DATABASE_MODE_READ_WRITE);
-    if (notmuch == NULL)
+    if (notmuch_database_open (notmuch_config_get_database_path (config),
+			       NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))
 	return 1;
 
     synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
 
     ret = tag_query (ctx, notmuch, query_string, tag_ops, synchronize_flags);
 
-    notmuch_database_close (notmuch);
+    notmuch_database_destroy (notmuch);
 
     return ret;
 }