X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-dump.c;h=9c6ad7f47b0fde514a5e64c96705d598f2eee7ec;hp=158142f55b4992c53de1396e7e557536b9074ec8;hb=4e2c351c588ad74f4800ca0344232be90387c54a;hpb=28d7544ae2adfe6467c6b64a3284f5ed13f81e1a diff --git a/notmuch-dump.c b/notmuch-dump.c index 158142f5..9c6ad7f4 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -19,59 +19,22 @@ */ #include "notmuch-client.h" -#include "dump-restore-private.h" +#include "hex-escape.h" #include "string-util.h" +#include -int -notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]) + +static int +database_dump_file (notmuch_database_t *notmuch, gzFile output, + const char *query_str, int output_format) { - notmuch_database_t *notmuch; notmuch_query_t *query; - FILE *output = stdout; notmuch_messages_t *messages; notmuch_message_t *message; notmuch_tags_t *tags; - const char *query_str = ""; - - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_ONLY, ¬much)) - return EXIT_FAILURE; - - char *output_file_name = NULL; - int opt_index; - - int output_format = DUMP_FORMAT_BATCH_TAG; - - notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f', - (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP }, - { "batch-tag", DUMP_FORMAT_BATCH_TAG }, - { 0, 0 } } }, - { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0 }, - { 0, 0, 0, 0, 0 } - }; - opt_index = parse_arguments (argc, argv, options, 1); - if (opt_index < 0) - return EXIT_FAILURE; - - if (output_file_name) { - output = fopen (output_file_name, "w"); - if (output == NULL) { - fprintf (stderr, "Error opening %s for writing: %s\n", - output_file_name, strerror (errno)); - return EXIT_FAILURE; - } - } - - - if (opt_index < argc) { - query_str = query_string_from_args (notmuch, argc - opt_index, argv + opt_index); - if (query_str == NULL) { - fprintf (stderr, "Out of memory.\n"); - return EXIT_FAILURE; - } - } + if (! query_str) + query_str = ""; query = notmuch_query_create (notmuch, query_str); if (query == NULL) { @@ -108,7 +71,7 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]) } if (output_format == DUMP_FORMAT_SUP) { - fprintf (output, "%s (", message_id); + gzprintf (output, "%s (", message_id); } for (tags = notmuch_message_get_tags (message); @@ -117,12 +80,12 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]) const char *tag_str = notmuch_tags_get (tags); if (! first) - fputs (" ", output); + gzputs (output, " "); first = 0; if (output_format == DUMP_FORMAT_SUP) { - fputs (tag_str, output); + gzputs (output, tag_str); } else { if (hex_encode (notmuch, tag_str, &buffer, &buffer_size) != HEX_SUCCESS) { @@ -130,12 +93,12 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]) tag_str); return EXIT_FAILURE; } - fprintf (output, "+%s", buffer); + gzprintf (output, "+%s", buffer); } } if (output_format == DUMP_FORMAT_SUP) { - fputs (")\n", output); + gzputs (output, ")\n"); } else { if (make_boolean_term (notmuch, "id", message_id, &buffer, &buffer_size)) { @@ -143,17 +106,147 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]) message_id, strerror (errno)); return EXIT_FAILURE; } - fprintf (output, " -- %s\n", buffer); + gzprintf (output, " -- %s\n", buffer); } notmuch_message_destroy (message); } - if (output != stdout) - fclose (output); - notmuch_query_destroy (query); - notmuch_database_destroy (notmuch); return EXIT_SUCCESS; } + +/* Dump database into output_file_name if it's non-NULL, stdout + * otherwise. + */ +int +notmuch_database_dump (notmuch_database_t *notmuch, + const char *output_file_name, + const char *query_str, + dump_format_t output_format, + notmuch_bool_t gzip_output) +{ + gzFile output = NULL; + const char *mode = gzip_output ? "w9" : "wT"; + const char *name_for_error = output_file_name ? output_file_name : "stdout"; + + char *tempname = NULL; + int outfd = -1; + + int ret = -1; + + if (output_file_name) { + tempname = talloc_asprintf (notmuch, "%s.XXXXXX", output_file_name); + outfd = mkstemp (tempname); + } else { + outfd = dup (STDOUT_FILENO); + } + + if (outfd < 0) { + fprintf (stderr, "Bad output file %s\n", name_for_error); + goto DONE; + } + + output = gzdopen (outfd, mode); + + if (output == NULL) { + fprintf (stderr, "Error opening %s for (gzip) writing: %s\n", + name_for_error, strerror (errno)); + if (close (outfd)) + fprintf (stderr, "Error closing %s during shutdown: %s\n", + name_for_error, strerror (errno)); + goto DONE; + } + + ret = database_dump_file (notmuch, output, query_str, output_format); + if (ret) goto DONE; + + ret = gzflush (output, Z_FINISH); + if (ret) { + fprintf (stderr, "Error flushing output: %s\n", gzerror (output, NULL)); + goto DONE; + } + + if (output_file_name) { + ret = fsync (outfd); + if (ret) { + fprintf (stderr, "Error syncing %s to disk: %s\n", + name_for_error, strerror (errno)); + goto DONE; + } + } + + if (gzclose_w (output) != Z_OK) { + fprintf (stderr, "Error closing %s: %s\n", name_for_error, + gzerror (output, NULL)); + ret = EXIT_FAILURE; + output = NULL; + goto DONE; + } + + if (output_file_name) { + ret = rename (tempname, output_file_name); + if (ret) { + fprintf (stderr, "Error renaming %s to %s: %s\n", + tempname, output_file_name, strerror (errno)); + goto DONE; + } + + } + DONE: + if (ret != EXIT_SUCCESS && output) + (void) gzclose_w (output); + + if (ret != EXIT_SUCCESS && output_file_name) + (void) unlink (tempname); + + return ret; +} + +int +notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[]) +{ + notmuch_database_t *notmuch; + const char *query_str = NULL; + int ret; + + if (notmuch_database_open (notmuch_config_get_database_path (config), + NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) + return EXIT_FAILURE; + + char *output_file_name = NULL; + int opt_index; + + int output_format = DUMP_FORMAT_BATCH_TAG; + notmuch_bool_t gzip_output = 0; + + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f', + (notmuch_keyword_t []){ { "sup", DUMP_FORMAT_SUP }, + { "batch-tag", DUMP_FORMAT_BATCH_TAG }, + { 0, 0 } } }, + { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0 }, + { NOTMUCH_OPT_BOOLEAN, &gzip_output, "gzip", 'z', 0 }, + { 0, 0, 0, 0, 0 } + }; + + opt_index = parse_arguments (argc, argv, options, 1); + if (opt_index < 0) + return EXIT_FAILURE; + + if (opt_index < argc) { + query_str = query_string_from_args (notmuch, argc - opt_index, argv + opt_index); + if (query_str == NULL) { + fprintf (stderr, "Out of memory.\n"); + return EXIT_FAILURE; + } + } + + ret = notmuch_database_dump (notmuch, output_file_name, query_str, + output_format, gzip_output); + + notmuch_database_destroy (notmuch); + + return ret; +}