cli: move config open/close to main() from subcommands

[notmuch] / notmuch-tag.c

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 6408babb5f1daf9ddd088f23047399c488942d06..0e73197cfb59595f5e7782d3e3d1c79aec2066f9 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -97,7 +97,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,
     notmuch_query_t *query;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
-    int ret = 0;
+    int ret = NOTMUCH_STATUS_SUCCESS;
 
     /* Optimize the query so it excludes messages that already have
      * the specified set of tags. */
@@ -140,6 +140,7 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
     size_t line_size = 0;
     ssize_t line_len;
     int ret = 0;
+    int warn = 0;
     tag_op_list_t *tag_ops;
 
     tag_ops = tag_op_list_create (ctx);
@@ -154,8 +155,13 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
        ret = parse_tag_line (ctx, line, TAG_FLAG_NONE,
                              &query_string, tag_ops);
 
-       if (ret > 0)
+       if (ret > 0) {
+           if (ret != TAG_PARSE_SKIPPED)
+               /* remember there has been problematic lines */
+               warn = 1;
+           ret = 0;
            continue;
+       }
 
        if (ret < 0)
            break;
@@ -168,15 +174,14 @@ tag_file (void *ctx, notmuch_database_t *notmuch, tag_op_flag_t flags,
     if (line)
        free (line);
 
-    return ret;
+    return ret || warn;
 }
 
 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;
@@ -219,21 +224,17 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
            return 1;
        }
     } 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;
        }
 
-       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;
     }
 
-    config = notmuch_config_open (ctx, NULL, NULL);
-    if (config == NULL)
-       return 1;
-
     if (notmuch_database_open (notmuch_config_get_database_path (config),
                               NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))
        return 1;
@@ -242,9 +243,9 @@ notmuch_tag_command (void *ctx, int argc, char *argv[])
        tag_flags |= TAG_FLAG_MAILDIR_SYNC;
 
     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);