util: Fix two corner-cases in boolean term quoting function

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index d9daf8fbe44a39f50ba2464cb6a057cfe372afc1..5b2f1e48d6a7ce7d19bae37f9838ad040cbf2642 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -99,12 +99,15 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     notmuch_message_t *message;
     int ret = NOTMUCH_STATUS_SUCCESS;
 
-    /* Optimize the query so it excludes messages that already have
-     * the specified set of tags. */
-    query_string = _optimize_tag_query (ctx, query_string, tag_ops);
-    if (query_string == NULL) {
-       fprintf (stderr, "Out of memory.\n");
-       return 1;
+    if (! (flags & TAG_FLAG_REMOVE_ALL)) {
+       /* Optimize the query so it excludes messages that already
+        * have the specified set of tags. */
+       query_string = _optimize_tag_query (ctx, query_string, tag_ops);
+       if (query_string == NULL) {
+           fprintf (stderr, "Out of memory.\n");
+           return 1;
+       }
+       flags |= TAG_FLAG_PRE_OPTIMIZED;
     }
 
     query = notmuch_query_create (notmuch, query_string);
@@ -120,7 +123,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
         notmuch_messages_valid (messages) && ! interrupted;
         notmuch_messages_move_to_next (messages)) {
        message = notmuch_messages_get (messages);
-       ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
+       ret = tag_op_list_apply (message, tag_ops, flags);
        notmuch_message_destroy (message);
        if (ret != NOTMUCH_STATUS_SUCCESS)
            break;
@@ -178,19 +181,19 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
 }
 
 int
-notmuch_tag_command (void *ctx, int argc, char *argv[])
+notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
 {
     tag_op_list_t *tag_ops = NULL;
     char *query_string = NULL;
-    notmuch_config_t *config;
     notmuch_database_t *notmuch;
     struct sigaction action;
     tag_op_flag_t tag_flags = TAG_FLAG_NONE;
     notmuch_bool_t batch = FALSE;
+    notmuch_bool_t remove_all = FALSE;
     FILE *input = stdin;
     char *input_file_name = NULL;
     int opt_index;
-    int ret = 0;
+    int ret;
 
     /* Setup our handler for SIGINT */
     memset (&action, 0, sizeof (struct sigaction));
@@ -202,12 +205,13 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
     notmuch_opt_desc_t options[] = {
        { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
        { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
+       { NOTMUCH_OPT_BOOLEAN, &remove_all, "remove-all", 0, 0 },
        { 0, 0, 0, 0, 0 }
     };
 
     opt_index = parse_arguments (argc, argv, options, 1);
     if (opt_index < 0)
-       return 1;
+       return EXIT_FAILURE;
 
     if (input_file_name) {
        batch = TRUE;
@@ -215,47 +219,60 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
        if (input == NULL) {
            fprintf (stderr, "Error opening %s for reading: %s\n",
                     input_file_name, strerror (errno));
-           return 1;
+           return EXIT_FAILURE;
        }
     }
 
     if (batch) {
        if (opt_index != argc) {
            fprintf (stderr, "Can't specify both cmdline and stdin!\n");
-           return 1;
+           return EXIT_FAILURE;
+       }
+       if (remove_all) {
+           fprintf (stderr, "Can't specify both --remove-all and --batch\n");
+           return EXIT_FAILURE;
        }
     } else {
-       tag_ops = tag_op_list_create (ctx);
+       tag_ops = tag_op_list_create (config);
        if (tag_ops == NULL) {
            fprintf (stderr, "Out of memory.\n");
-           return 1;
+           return EXIT_FAILURE;
        }
 
-       if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index,
+       if (parse_tag_command_line (config, argc - opt_index, argv + opt_index,
                                    &query_string, tag_ops))
-           return 1;
-    }
+           return EXIT_FAILURE;
 
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
-       return 1;
+       if (tag_op_list_size (tag_ops) == 0 && ! remove_all) {
+           fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
+           return EXIT_FAILURE;
+       }
+
+       if (*query_string == '\0') {
+           fprintf (stderr, "Error: notmuch tag requires at least one search term.\n");
+           return EXIT_FAILURE;
+       }
+    }
 
     if (notmuch_database_open (notmuch_config_get_database_path (config),
                               NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))
-       return 1;
+       return EXIT_FAILURE;
 
     if (notmuch_config_get_maildir_synchronize_flags (config))
        tag_flags |= TAG_FLAG_MAILDIR_SYNC;
 
+    if (remove_all)
+       tag_flags |= TAG_FLAG_REMOVE_ALL;
+
     if (batch)
-       ret = tag_file (ctx, notmuch, tag_flags, input);
+       ret = tag_file (config, notmuch, tag_flags, input);
     else
-       ret = tag_query (ctx, notmuch, query_string, tag_ops, tag_flags);
+       ret = tag_query (config, notmuch, query_string, tag_ops, tag_flags);
 
     notmuch_database_destroy (notmuch);
 
     if (input != stdin)
        fclose (input);
 
-    return ret || interrupted;
+    return ret || interrupted ? EXIT_FAILURE : EXIT_SUCCESS;
 }