X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=a93df8235f605dc55160fe3a57ef963ac82271f7;hp=966901f04b1c42b8affcfe23496b61eab3e4f6bc;hb=af65f52acf4eac5b2187855a63895afe3386c074;hpb=00b65cad98e7d09f5005587ea8b51d0d4160bd45

diff --git a/notmuch.c b/notmuch.c
index 966901f0..a93df823 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -35,6 +35,8 @@
 #include <dirent.h>
 #include <errno.h>
 
+#include <talloc.h>
+
 #include <glib.h> /* g_strdup_printf */
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
@@ -97,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);
 }
@@ -289,13 +291,17 @@ setup_command (int argc, char *argv[])
     getline (&mail_directory, &line_size, stdin);
     printf ("\n");
 
+    if (mail_directory &&
+	mail_directory[strlen(mail_directory)-1] == '\n')
+    {
+	mail_directory[strlen(mail_directory)-1] = '\0';
+    }
+
     if (mail_directory == NULL || strlen (mail_directory) == 0) {
 	if (mail_directory)
 	    free (mail_directory);
 	mail_directory = default_path;
     } else {
-	if (mail_directory[strlen(mail_directory)-1] == '\n')
-	    mail_directory[strlen(mail_directory)-1] = '\0';
 	/* XXX: Instead of telling the user to use an environment
 	 * variable here, we should really be writing out a configuration
 	 * file and loading that on the next run. */
@@ -366,8 +372,78 @@ show_command (int argc, char *argv[])
 int
 dump_command (int argc, char *argv[])
 {
-    fprintf (stderr, "Error: dump is not implemented yet.\n");
-    return 1;
+    FILE *output;
+    notmuch_database_t *notmuch = NULL;
+    notmuch_query_t *query;
+    notmuch_results_t *results;
+    notmuch_message_t *message;
+    notmuch_tags_t *tags;
+    int ret = 0;
+
+    if (argc) {
+	output = fopen (argv[0], "w");
+	if (output == NULL) {
+	    fprintf (stderr, "Error opening %s for writing: %s\n",
+		     argv[1], strerror (errno));
+	    ret = 1;
+	    goto DONE;
+	}
+    } else {
+	output = stdout;
+    }
+
+    notmuch = notmuch_database_open (NULL);
+    if (notmuch == NULL) {
+	ret = 1;
+	goto DONE;
+    }
+
+    query = notmuch_query_create (notmuch, "");
+    if (query == NULL) {
+	fprintf (stderr, "Out of memory\n");
+	ret = 1;
+	goto DONE;
+    }
+
+    notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
+
+    for (results = notmuch_query_search (query);
+	 notmuch_results_has_more (results);
+	 notmuch_results_advance (results))
+    {
+	message = notmuch_results_get (results);
+
+	fprintf (output,
+		 "%s (", notmuch_message_get_message_id (message));
+
+	for (tags = notmuch_message_get_tags (message);
+	     notmuch_tags_has_more (tags);
+	     notmuch_tags_advance (tags))
+	{
+	    int first = 1;
+
+	    if (! first)
+		fprintf (output, " ");
+
+	    fprintf (output, "%s", notmuch_tags_get (tags));
+
+	    first = 0;
+	}
+
+	fprintf (output, ")\n");
+
+	notmuch_message_destroy (message);
+    }
+
+    notmuch_query_destroy (query);
+
+  DONE:
+    if (notmuch)
+	notmuch_database_close (notmuch);
+    if (output != stdout)
+	fclose (output);
+
+    return ret;
 }
 
 int