X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-restore.c;h=9ed9b515754036ec285f2af214f52fe980d84771;hp=670d01f92a0e1f302bc0ce3e5776e77d063fd7d8;hb=525ee27ed07b183a1869206b4b39129877bbcaf4;hpb=33434d76f3fdb6f0602ab50bd9e72f5f12ce3e4b

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 670d01f9..9ed9b515 100644
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -25,6 +25,9 @@
 
 static regex_t regex;
 
+/* Non-zero return indicates an error in retrieving the message,
+ * or in applying the tags.
+ */
 static int
 tag_message (unused (void *ctx),
 	     notmuch_database_t *notmuch,
@@ -38,7 +41,7 @@ tag_message (unused (void *ctx),
 
     status = notmuch_database_find_message (notmuch, message_id, &message);
     if (status || message == NULL) {
-	fprintf (stderr, "Warning: Cannot apply tags to %smessage: %s\n",
+	fprintf (stderr, "Warning: cannot apply tags to %smessage: %s\n",
 		 message ? "" : "missing ", message_id);
 	if (status)
 	    fprintf (stderr, "%s\n", notmuch_status_to_string (status));
@@ -48,7 +51,7 @@ tag_message (unused (void *ctx),
     /* In order to detect missing messages, this check/optimization is
      * intentionally done *after* first finding the message. */
     if ((flags & TAG_FLAG_REMOVE_ALL) || tag_op_list_size (tag_ops))
-	tag_op_list_apply (message, tag_ops, flags);
+	ret = tag_op_list_apply (message, tag_ops, flags);
 
     notmuch_message_destroy (message);
 
@@ -102,7 +105,7 @@ parse_sup_line (void *ctx, char *line,
 	    tok_len++;
 	}
 
-	if (tag_op_list_append (ctx, tag_ops, tok, FALSE))
+	if (tag_op_list_append (tag_ops, tok, FALSE))
 	    return -1;
     }
 
@@ -122,6 +125,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
     char *input_file_name = NULL;
     FILE *input = stdin;
     char *line = NULL;
+    void *line_ctx = NULL;
     size_t line_size;
     ssize_t line_len;
 
@@ -205,15 +209,19 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
     do {
 	char *query_string;
 
+	if (line_ctx != NULL)
+	    talloc_free (line_ctx);
+
+	line_ctx = talloc_new (ctx);
 	if (input_format == DUMP_FORMAT_SUP) {
-	    ret = parse_sup_line (ctx, line, &query_string, tag_ops);
+	    ret = parse_sup_line (line_ctx, line, &query_string, tag_ops);
 	} else {
-	    ret = parse_tag_line (ctx, line, TAG_FLAG_BE_GENEROUS,
+	    ret = parse_tag_line (line_ctx, line, TAG_FLAG_BE_GENEROUS,
 				  &query_string, tag_ops);
 
 	    if (ret == 0) {
 		if (strncmp ("id:", query_string, 3) != 0) {
-		    fprintf (stderr, "Unsupported query: %s\n", query_string);
+		    fprintf (stderr, "Warning: unsupported query: %s\n", query_string);
 		    continue;
 		}
 		/* delete id: from front of string; tag_message
@@ -231,12 +239,19 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
 	if (ret > 0)
 	    continue;
 
-	if (ret < 0 || tag_message (ctx, notmuch, query_string,
-				    tag_ops, flags))
+	if (ret < 0)
+	    break;
+
+	ret = tag_message (line_ctx, notmuch, query_string,
+			   tag_ops, flags);
+	if (ret)
 	    break;
 
     }  while ((line_len = getline (&line, &line_size, input)) != -1);
 
+    if (line_ctx != NULL)
+	talloc_free (line_ctx);
+
     if (input_format == DUMP_FORMAT_SUP)
 	regfree (&regex);