X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=43af75d2450215c3a67019c425e266cb9b00b2f6;hp=d35bda7263085f63ce644598e0c07a240ecbfb2e;hb=aad13c3ac947a42b3e0a1923c44a927feea827f5;hpb=67a0ee2ebb90229d92a5e9a7c676ff1a95fc1008

diff --git a/notmuch.c b/notmuch.c
index d35bda72..43af75d2 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -20,8 +20,13 @@
 
 #include "notmuch.h"
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE /* for getline */
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -30,7 +35,9 @@
 #include <dirent.h>
 #include <errno.h>
 
-#include <glib.h> /* GIOChannel */
+#include <talloc.h>
+
+#include <glib.h> /* g_strdup_printf */
 
 #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0]))
 
@@ -42,42 +49,6 @@ typedef struct command {
     const char *usage;
 } command_t;
 
-/* Read a line from stdin, without any line-terminator character.  The
- * return value is a newly allocated string. The caller should free()
- * the string when finished with it.
- *
- * This function returns NULL if EOF is encountered before any
- * characters are input (otherwise it returns those characters).
- */
-char *
-read_line (void)
-{
-    char *result = NULL;
-    GError *error = NULL;
-    GIOStatus g_io_status;
-    gsize length;
-
-    GIOChannel *channel = g_io_channel_unix_new (fileno (stdin));
-
-    g_io_status = g_io_channel_read_line (channel, &result,
-					  &length, NULL, &error);
-
-    if (g_io_status == EOF)
-	goto DONE;
-
-    if (g_io_status != G_IO_STATUS_NORMAL) {
-	fprintf(stderr, "Read error: %s\n", error->message);
-	exit (1);
-    }
-
-    if (length && result[length - 1] == '\n')
-	result[length - 1] = '\0';
-
-  DONE:
-    g_io_channel_unref (channel);
-    return result;
-}
-
 typedef struct {
     int total_messages;
     int count;
@@ -286,6 +257,7 @@ setup_command (int argc, char *argv[])
 {
     notmuch_database_t *notmuch;
     char *mail_directory, *default_path;
+    size_t line_size;
     int count;
     add_files_state_t add_files_state;
     double elapsed;
@@ -315,9 +287,16 @@ setup_command (int argc, char *argv[])
     printf ("Top-level mail directory [%s]: ", default_path);
     fflush (stdout);
 
-    mail_directory = read_line ();
+    mail_directory = NULL;
+    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);
@@ -393,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, NOTMUCH_QUERY_ALL);
+    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