From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 53D236DE0939 for ; Sat, 6 Aug 2016 06:54:13 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.003 X-Spam-Level: X-Spam-Status: No, score=-0.003 tagged_above=-999 required=5 tests=[AWL=-0.004, HEADER_FROM_DIFFERENT_DOMAINS=0.001] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OQsEQXvnwvQ0 for ; Sat, 6 Aug 2016 06:54:05 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 6139D6DE0363 for ; Sat, 6 Aug 2016 06:53:06 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1bW22T-0007ER-7L; Sat, 06 Aug 2016 09:53:21 -0400 Received: (nullmailer pid 4135 invoked by uid 1000); Sat, 06 Aug 2016 13:52:44 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 6/9] CLI: refactor dumping of tags. Date: Sat, 6 Aug 2016 22:52:36 +0900 Message-Id: <1470491559-3946-7-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1470491559-3946-1-git-send-email-david@tethera.net> References: <1470491559-3946-1-git-send-email-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Aug 2016 13:54:13 -0000 This is mainly code movement, to make room in the loop over messages for dumping properties. --- notmuch-dump.c | 127 +++++++++++++++++++++++++++++++-------------------------- 1 file changed, 69 insertions(+), 58 deletions(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index cae1db8..d80ed8b8 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -78,13 +78,78 @@ print_dump_header (gzFile output, int output_format, int include) } static int +dump_tags_message (void *ctx, + notmuch_message_t *message, int output_format, + gzFile output, + char **buffer_p, size_t *size_p) +{ + int first = 1; + const char *message_id; + + message_id = notmuch_message_get_message_id (message); + + if (output_format == DUMP_FORMAT_BATCH_TAG && + strchr (message_id, '\n')) { + /* This will produce a line break in the output, which + * would be difficult to handle in tools. However, it's + * also impossible to produce an email containing a line + * break in a message ID because of unfolding, so we can + * safely disallow it. */ + fprintf (stderr, "Warning: skipping message id containing line break: \"%s\"\n", message_id); + return EXIT_SUCCESS; + } + + if (output_format == DUMP_FORMAT_SUP) { + gzprintf (output, "%s (", message_id); + } + + for (notmuch_tags_t *tags = notmuch_message_get_tags (message); + notmuch_tags_valid (tags); + notmuch_tags_move_to_next (tags)) { + const char *tag_str = notmuch_tags_get (tags); + + if (! first) + gzputs (output, " "); + + first = 0; + + if (output_format == DUMP_FORMAT_SUP) { + gzputs (output, tag_str); + } else { + if (hex_encode (ctx, tag_str, + buffer_p, size_p) != HEX_SUCCESS) { + fprintf (stderr, "Error: failed to hex-encode tag %s\n", + tag_str); + return EXIT_FAILURE; + } + gzprintf (output, "+%s", *buffer_p); + } + } + + if (output_format == DUMP_FORMAT_SUP) { + gzputs (output, ")\n"); + } else { + if (make_boolean_term (ctx, "id", message_id, + buffer_p, size_p)) { + fprintf (stderr, "Error quoting message id %s: %s\n", + message_id, strerror (errno)); + return EXIT_FAILURE; + } + gzprintf (output, " -- %s\n", *buffer_p); + } + return EXIT_SUCCESS; +} + +static int database_dump_file (notmuch_database_t *notmuch, gzFile output, const char *query_str, int output_format, int include) { notmuch_query_t *query; notmuch_messages_t *messages; notmuch_message_t *message; - notmuch_tags_t *tags; + notmuch_status_t status; + char *buffer = NULL; + size_t buffer_size = 0; print_dump_header (output, output_format, include); @@ -110,10 +175,6 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output, */ notmuch_query_set_sort (query, NOTMUCH_SORT_UNSORTED); - char *buffer = NULL; - size_t buffer_size = 0; - notmuch_status_t status; - status = notmuch_query_search_messages_st (query, &messages); if (print_status_query ("notmuch dump", query, status)) return EXIT_FAILURE; @@ -121,62 +182,12 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output, for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) { - int first = 1; - const char *message_id; message = notmuch_messages_get (messages); - message_id = notmuch_message_get_message_id (message); - - if (output_format == DUMP_FORMAT_BATCH_TAG && - strchr (message_id, '\n')) { - /* This will produce a line break in the output, which - * would be difficult to handle in tools. However, it's - * also impossible to produce an email containing a line - * break in a message ID because of unfolding, so we can - * safely disallow it. */ - fprintf (stderr, "Warning: skipping message id containing line break: \"%s\"\n", message_id); - notmuch_message_destroy (message); - continue; - } - if (output_format == DUMP_FORMAT_SUP) { - gzprintf (output, "%s (", message_id); - } - - for (tags = notmuch_message_get_tags (message); - notmuch_tags_valid (tags); - notmuch_tags_move_to_next (tags)) { - const char *tag_str = notmuch_tags_get (tags); - - if (! first) - gzputs (output, " "); - - first = 0; - - if (output_format == DUMP_FORMAT_SUP) { - gzputs (output, tag_str); - } else { - if (hex_encode (notmuch, tag_str, - &buffer, &buffer_size) != HEX_SUCCESS) { - fprintf (stderr, "Error: failed to hex-encode tag %s\n", - tag_str); - return EXIT_FAILURE; - } - gzprintf (output, "+%s", buffer); - } - } - - if (output_format == DUMP_FORMAT_SUP) { - gzputs (output, ")\n"); - } else { - if (make_boolean_term (notmuch, "id", message_id, - &buffer, &buffer_size)) { - fprintf (stderr, "Error quoting message id %s: %s\n", - message_id, strerror (errno)); - return EXIT_FAILURE; - } - gzprintf (output, " -- %s\n", buffer); - } + if (dump_tags_message (notmuch, message, output_format, output, + &buffer, &buffer_size)) + return EXIT_FAILURE; notmuch_message_destroy (message); } -- 2.8.1