notmuch-restore: handle empty input file, leading blank lines and comments.

[notmuch] / notmuch-restore.c

diff --git a/notmuch-restore.c b/notmuch-restore.c
index 28cbacf0cad7bf9c3bb9bf5c3067e3a1d2a2f715..f43698984e4c5a5dec41b9bc1e46a56422208f41 100644 (file)
--- a/notmuch-restore.c
+++ b/notmuch-restore.c
@@ -88,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;
@@ -105,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;
     }
 
@@ -125,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;
 
@@ -179,11 +181,6 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
                 argv[opt_index]);
        return 1;
     }
-    char *p;
-
-    line_len = getline (&line, &line_size, input);
-    if (line_len == 0)
-       return 0;
 
     tag_ops = tag_op_list_create (ctx);
     if (tag_ops == NULL) {
@@ -191,6 +188,19 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
        return 1;
     }
 
+    do {
+       line_len = getline (&line, &line_size, input);
+
+       /* empty input file not considered an error */
+       if (line_len < 0)
+           return 0;
+
+    } while ((line_len == 0) ||
+            (line[0] == '#') ||
+            /* the cast is safe because we checked about for line_len < 0 */
+            (strspn (line, " \t\n") == (unsigned)line_len));
+
+    char *p;
     for (p = line; (input_format == DUMP_FORMAT_AUTO) && *p; p++) {
        if (*p == '(')
            input_format = DUMP_FORMAT_SUP;
@@ -208,10 +218,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) {
@@ -237,13 +251,16 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
        if (ret < 0)
            break;
 
-       ret = tag_message (ctx, notmuch, query_string,
+       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);