notmuch-restore: use debug version of talloc_strndup

[notmuch] / notmuch-restore.c

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 40596a803a5908d1bcf9bce1ea2661c3a98d854d..d43546d345926c561bcdb1d91848377fa1184534 100644 (file)
--- 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,
@@ -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);
 
@@ -85,10 +88,11 @@ parse_sup_line (void *ctx, char *line,
        return 1;
     }
 
-    *query_str = talloc_strndup (ctx, line + match[1].rm_so,
-                                match[1].rm_eo - match[1].rm_so);
-    file_tags = talloc_strndup (ctx, line + match[2].rm_so,
-                               match[2].rm_eo - match[2].rm_so);
+    *query_str = talloc_strndup_debug (ctx, line + match[1].rm_so,
+                                      match[1].rm_eo - match[1].rm_so);
+
+    file_tags = talloc_strndup_debug (ctx, line + match[2].rm_so,
+                                     match[2].rm_eo - match[2].rm_so);
 
     char *tok = file_tags;
     size_t tok_len = 0;
@@ -102,7 +106,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 +126,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,10 +210,14 @@ 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) {
@@ -231,12 +240,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);