X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=2d208cead1075e91bd526558b903b8f623a0a6d4;hp=dac19d8955ec231bf9177df2f2e358adfd24b587;hb=f96f4fe427d7fd8930db7589e377f5c8cb97f2dc;hpb=55c8ee9a862f8f25be84adb591564b3777d88135 diff --git a/notmuch.c b/notmuch.c index dac19d89..2d208cea 100644 --- a/notmuch.c +++ b/notmuch.c @@ -20,8 +20,13 @@ #include "notmuch.h" +#ifndef _GNU_SOURCE +#define _GNU_SOURCE /* for getline */ +#endif + #include #include +#include #include #include #include @@ -30,7 +35,9 @@ #include #include -#include /* GIOChannel */ +#include + +#include /* g_strdup_printf */ #define ARRAY_SIZE(arr) (sizeof (arr) / sizeof (arr[0])) @@ -42,48 +49,19 @@ 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; struct timeval tv_start; } add_files_state_t; +static void +chomp_newline (char *str) +{ + if (str && str[strlen(str)-1] == '\n') + str[strlen(str)-1] = '\0'; +} + /* Compute the number of seconds elapsed from start to end. */ double tv_elapsed (struct timeval start, struct timeval end) @@ -128,7 +106,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); } @@ -285,7 +263,8 @@ int setup_command (int argc, char *argv[]) { notmuch_database_t *notmuch; - char *mail_directory; + char *mail_directory, *default_path; + size_t line_size; int count; add_files_state_t add_files_state; double elapsed; @@ -310,19 +289,35 @@ setup_command (int argc, char *argv[]) "such as mb2md. In that case, press Control-C now and run notmuch again\n" "once the conversion is complete.\n\n"); - { - char *default_path = notmuch_database_default_path (); - printf ("Top-level mail directory [%s]: ", default_path); - free (default_path); - fflush (stdout); - } - mail_directory = read_line (); + default_path = notmuch_database_default_path (); + printf ("Top-level mail directory [%s]: ", default_path); + fflush (stdout); + + mail_directory = NULL; + getline (&mail_directory, &line_size, stdin); + chomp_newline (mail_directory); + + printf ("\n"); if (mail_directory == NULL || strlen (mail_directory) == 0) { if (mail_directory) free (mail_directory); - mail_directory = notmuch_database_default_path (); + mail_directory = default_path; + } else { + /* 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. */ + if (strcmp (mail_directory, default_path)) { + printf ("Note: Since you are not using the default path, you will want to set\n" + "the NOTMUCH_BASE environment variable to %s so that\n" + "future calls to notmuch commands will know where to find your mail.\n", + mail_directory); + printf ("For example, if you are using bash for your shell, add:\n\n"); + printf ("\texport NOTMUCH_BASE=%s\n\n", mail_directory); + printf ("to your ~/.bashrc file.\n\n"); + } + free (default_path); } notmuch = notmuch_database_create (mail_directory); @@ -380,8 +375,77 @@ 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[0], 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)) + { + int first = 1; + 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)) + { + 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