notmuch setup: Collapse internal whitespace within message-id

[notmuch] / notmuch.c

diff --git a/notmuch.c b/notmuch.c
index cedfebce4c029159cfa23f8960757f7006758200..a93df8235f605dc55160fe3a57ef963ac82271f7 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -99,7 +99,7 @@ add_files_print_progress (add_files_state_t *state)
            state->count, state->total_messages);
     print_formatted_seconds ((state->total_messages - state->count) /
                             rate_overall);
-    printf (" remaining).\r");
+    printf (" remaining).      \r");
 
     fflush (stdout);
 }
@@ -398,7 +398,7 @@ dump_command (int argc, char *argv[])
        goto DONE;
     }
 
-    query = notmuch_query_create (notmuch, NOTMUCH_QUERY_ALL);
+    query = notmuch_query_create (notmuch, "");
     if (query == NULL) {
        fprintf (stderr, "Out of memory\n");
        ret = 1;
@@ -431,6 +431,8 @@ dump_command (int argc, char *argv[])
        }
 
        fprintf (output, ")\n");
+
+       notmuch_message_destroy (message);
     }
 
     notmuch_query_destroy (query);