X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=ae1d5976b71f426329e09964b9c412ba854ab606;hp=ef93ded9b3a848297e1d72c960801eb528a48500;hb=c12823648ee84b4748e0e9f0cd97f7264911b589;hpb=c7482b4dce114b1c09cbac2f4ef6d0defdb23258 diff --git a/notmuch.c b/notmuch.c index ef93ded9..ae1d5976 100644 --- a/notmuch.c +++ b/notmuch.c @@ -41,8 +41,6 @@ #include -#include /* g_strdup_printf */ - #define unused(x) x __attribute__ ((unused)) /* There's no point in continuing when we've detected that we've done @@ -236,7 +234,7 @@ add_files_recursive (notmuch_database_t *notmuch, continue; } - next = g_strdup_printf ("%s/%s", path, entry->d_name); + next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name); if (stat (next, st)) { fprintf (stderr, "Error reading %s: %s\n", @@ -267,10 +265,16 @@ add_files_recursive (notmuch_database_t *notmuch, break; /* Fatal issues. Don't process anymore. */ case NOTMUCH_STATUS_XAPIAN_EXCEPTION: - fprintf (stderr, "A Xapian error was encountered. Halting processing.\n"); + case NOTMUCH_STATUS_OUT_OF_MEMORY: + fprintf (stderr, "Error: %s. Halting processing.\n", + notmuch_status_to_string (status)); ret = status; goto DONE; default: + case NOTMUCH_STATUS_FILE_ERROR: + case NOTMUCH_STATUS_NULL_POINTER: + case NOTMUCH_STATUS_TAG_TOO_LONG: + case NOTMUCH_STATUS_LAST_STATUS: INTERNAL_ERROR ("add_message returned unexpected value: %d", status); goto DONE; } @@ -283,7 +287,7 @@ add_files_recursive (notmuch_database_t *notmuch, ret = status; } - free (next); + talloc_free (next); next = NULL; } @@ -293,7 +297,7 @@ add_files_recursive (notmuch_database_t *notmuch, DONE: if (next) - free (next); + talloc_free (next); if (entry) free (entry); if (dir) @@ -336,7 +340,7 @@ static void count_files (const char *path, int *count) { DIR *dir; - struct dirent *entry, *e; + struct dirent *e, *entry = NULL; int entry_length; int err; char *next; @@ -347,7 +351,7 @@ count_files (const char *path, int *count) if (dir == NULL) { fprintf (stderr, "Warning: failed to open directory %s: %s\n", path, strerror (errno)); - return; + goto DONE; } entry_length = offsetof (struct dirent, d_name) + @@ -360,7 +364,7 @@ count_files (const char *path, int *count) fprintf (stderr, "Error reading directory: %s\n", strerror (errno)); free (entry); - return; + goto DONE; } if (e == NULL) @@ -378,7 +382,12 @@ count_files (const char *path, int *count) continue; } - next = g_strdup_printf ("%s/%s", path, entry->d_name); + if (asprintf (&next, "%s/%s", path, entry->d_name) == -1) { + next = NULL; + fprintf (stderr, "Error descending from %s to %s: Out of memory\n", + path, entry->d_name); + continue; + } stat (next, &st); @@ -395,7 +404,9 @@ count_files (const char *path, int *count) free (next); } - free (entry); + DONE: + if (entry) + free (entry); closedir (dir); } @@ -602,8 +613,8 @@ search_command (int argc, char *argv[]) void *local = talloc_new (NULL); notmuch_database_t *notmuch = NULL; notmuch_query_t *query; - notmuch_results_t *results; - notmuch_message_t *message; + notmuch_thread_results_t *results; + notmuch_thread_t *thread; notmuch_tags_t *tags; char *query_str; int i; @@ -632,30 +643,31 @@ search_command (int argc, char *argv[]) goto DONE; } - for (results = notmuch_query_search (query); - notmuch_results_has_more (results); - notmuch_results_advance (results)) + for (results = notmuch_query_search_threads (query); + notmuch_thread_results_has_more (results); + notmuch_thread_results_advance (results)) { int first = 1; - message = notmuch_results_get (results); - printf ("%s (", notmuch_message_get_message_id (message)); + thread = notmuch_thread_results_get (results); - for (tags = notmuch_message_get_tags (message); + printf ("%s %s", + notmuch_thread_get_thread_id (thread), + _notmuch_thread_get_subject (thread)); + + printf (" ("); + for (tags = notmuch_thread_get_tags (thread); notmuch_tags_has_more (tags); notmuch_tags_advance (tags)) { if (! first) printf (" "); - printf ("%s", notmuch_tags_get (tags)); - first = 0; } - printf (")\n"); - notmuch_message_destroy (message); + notmuch_thread_destroy (thread); } notmuch_query_destroy (query); @@ -678,10 +690,10 @@ show_command (unused (int argc), unused (char *argv[])) static int dump_command (int argc, char *argv[]) { - FILE *output; + FILE *output = NULL; notmuch_database_t *notmuch = NULL; notmuch_query_t *query; - notmuch_results_t *results; + notmuch_message_results_t *results; notmuch_message_t *message; notmuch_tags_t *tags; int ret = 0; @@ -713,12 +725,12 @@ dump_command (int argc, char *argv[]) notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID); - for (results = notmuch_query_search (query); - notmuch_results_has_more (results); - notmuch_results_advance (results)) + for (results = notmuch_query_search_messages (query); + notmuch_message_results_has_more (results); + notmuch_message_results_advance (results)) { int first = 1; - message = notmuch_results_get (results); + message = notmuch_message_results_get (results); fprintf (output, "%s (", notmuch_message_get_message_id (message)); @@ -745,7 +757,7 @@ dump_command (int argc, char *argv[]) DONE: if (notmuch) notmuch_database_close (notmuch); - if (output != stdout) + if (output && output != stdout) fclose (output); return ret; @@ -754,7 +766,7 @@ dump_command (int argc, char *argv[]) static int restore_command (int argc, char *argv[]) { - FILE *input; + FILE *input = NULL; notmuch_database_t *notmuch = NULL; char *line = NULL; size_t line_size; @@ -855,6 +867,8 @@ restore_command (int argc, char *argv[]) free (line); if (notmuch) notmuch_database_close (notmuch); + if (input && input != stdin) + fclose (input); return ret; } @@ -932,11 +946,11 @@ main (int argc, char *argv[]) strcmp (argv[1], "--help") == 0) { fprintf (stderr, "The notmuch mail system.\n\n"); + usage (); + return 0; } else { fprintf (stderr, "Error: Unknown command '%s'\n\n", argv[1]); + usage (); + return 1; } - usage (); - exit (1); - - return 0; }