From: Jani Nikula Date: Sat, 18 Jun 2016 21:31:27 +0000 (+0300) Subject: [PATCH 1/7] cli/reply: push notmuch reply format abstraction lower in the stack X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96d316c19da00e1de1faf2e68443077b93e5b49e;p=notmuch-archives.git [PATCH 1/7] cli/reply: push notmuch reply format abstraction lower in the stack --- diff --git a/3f/2bbfa0281e2bb99e7606866dd703963cffeeff b/3f/2bbfa0281e2bb99e7606866dd703963cffeeff new file mode 100644 index 000000000..50275cdcb --- /dev/null +++ b/3f/2bbfa0281e2bb99e7606866dd703963cffeeff @@ -0,0 +1,420 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 91C8F6DE034D + for ; Sat, 18 Jun 2016 14:33:09 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" +X-Spam-Flag: NO +X-Spam-Score: -0.563 +X-Spam-Level: +X-Spam-Status: No, score=-0.563 tagged_above=-999 required=5 tests=[AWL=0.157, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_LOW=-0.7, + RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] 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 B5KL1YfQwBXU for ; + Sat, 18 Jun 2016 14:33:01 -0700 (PDT) +Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com + [74.125.82.67]) by arlo.cworth.org (Postfix) with ESMTPS id 005FA6DE00DF for + ; Sat, 18 Jun 2016 14:33:00 -0700 (PDT) +Received: by mail-wm0-f67.google.com with SMTP id c82so2550855wme.3 + for ; Sat, 18 Jun 2016 14:33:00 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=nikula-org.20150623.gappssmtp.com; s=20150623; + h=from:to:cc:subject:date:message-id:in-reply-to:references + :in-reply-to:references; + bh=0gTT1Cs2x5flbIL5lOKo8lgQoRdqG9bi3NSycpTh6/I=; + b=j9HBsAfAVrT8C/54OyYk7Ku7rQccosUyqQd9q53bpKhWhCrbXEE80dPwvYvyGCQuhV + sc0puSwUt7UkS/11+3ASnnvyvscCMkpAP0VEw85bLoBUP8CHQRqoxRqV0uD68TnnJ3/P + GWoOJOJHF73sKq63YFP+bl5pYM//f698C4PyIjg+3oOPkwJ+CnkS1pNowL2SZTMk3OAh + Sd6CY/F99lpL+yY19WtopjzmgEJl5eASO2sYi3kcJnJ9tkwfYONCQYpDeGdkZEWgF18a + KDiUGspWhx2yAusbROWhwLcLteDNfiLWVILOzOHblX8MiRMuXo1mMhQQ+EDsqTKMy1SN + ikHA== +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references:in-reply-to:references; + bh=0gTT1Cs2x5flbIL5lOKo8lgQoRdqG9bi3NSycpTh6/I=; + b=aUdlSkvBWNApBYdzGMqzqVGqeYkt3KAtV8b5IZwi2c9W7tmVlG7lSy8r87gBbBk5OG + Qrp0A9TODdH8EDkqScdSIwioHmP9FF9W7wEluipnX9I8X3QL+Pbih+jncCKRFxJhVgrD + Vmguo/He/jHuPOU3POk7zDv92YAOqglipJ5OL0sGIdUDMxxsqC/J6X41cTZuiLLes/wk + AtQlzRww2pwLijGwngacJjJ27WjDWtv3p25PN+tJr9ETRpgIIjZY5W2wJqvVrJC/YDNH + qpc8G3BqDmPuHnwdelXmTKQ9AFAHCJcbN4rLq0nObQFG95P4Yb/lsU2L0++3mSXSxjbC + Xkwg== +X-Gm-Message-State: + ALyK8tLhcSZxh4e9pcmNntkPJJ0vAWeYSDuwzBzLq1lRIcZFrx/amniscLYsnOBnOtKQ8w== +X-Received: by 10.28.135.137 with SMTP id j131mr4251433wmd.47.1466285579405; + Sat, 18 Jun 2016 14:32:59 -0700 (PDT) +Received: from localhost (mobile-access-bcee4e-81.dhcp.inet.fi. + [188.238.78.81]) + by smtp.gmail.com with ESMTPSA id j4sm54730882wjg.20.2016.06.18.14.32.58 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 18 Jun 2016 14:32:58 -0700 (PDT) +From: Jani Nikula +To: notmuch@notmuchmail.org +Cc: jani@nikula.org, + Daniel Kahn Gillmor +Subject: [PATCH 1/7] cli/reply: push notmuch reply format abstraction lower in + the stack +Date: Sun, 19 Jun 2016 00:31:27 +0300 +Message-Id: + +X-Mailer: git-send-email 2.1.4 +In-Reply-To: +References: +In-Reply-To: +References: +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, 18 Jun 2016 21:33:09 -0000 + +There's quite a bit of duplication, and some consequent deviation, +between the various notmuch reply format code paths. Perform the query +and message iteration in common code, and make the format specific +functions operate on single messages. + +There should be no functional changes. +--- + notmuch-reply.c | 216 ++++++++++++++++++++++++++------------------------------ + 1 file changed, 101 insertions(+), 115 deletions(-) + +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 49513732e620..847e306f94d2 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -598,82 +598,42 @@ create_reply_message(void *ctx, + static int + notmuch_reply_format_default(void *ctx, + notmuch_config_t *config, +- notmuch_query_t *query, ++ notmuch_message_t *message, + notmuch_show_params_t *params, + notmuch_bool_t reply_all, + unused (sprinter_t *sp)) + { + GMimeMessage *reply; +- notmuch_messages_t *messages; +- notmuch_message_t *message; + mime_node_t *root; +- notmuch_status_t status; + +- status = notmuch_query_search_messages_st (query, &messages); +- if (print_status_query ("notmuch reply", query, status)) ++ reply = create_reply_message (ctx, config, message, reply_all); ++ if (!reply) + return 1; + +- for (; +- notmuch_messages_valid (messages); +- notmuch_messages_move_to_next (messages)) +- { +- message = notmuch_messages_get (messages); ++ show_reply_headers (reply); + +- reply = create_reply_message (ctx, config, message, reply_all); +- +- /* If reply creation failed, we're out of memory, so don't +- * bother trying any more messages. +- */ +- if (!reply) { +- notmuch_message_destroy (message); +- return 1; +- } +- +- show_reply_headers (reply); +- +- g_object_unref (G_OBJECT (reply)); +- reply = NULL; +- +- if (mime_node_open (ctx, message, &(params->crypto), &root) == NOTMUCH_STATUS_SUCCESS) { +- format_part_reply (root); +- talloc_free (root); +- } ++ g_object_unref (G_OBJECT (reply)); + +- notmuch_message_destroy (message); ++ if (mime_node_open (ctx, message, ¶ms->crypto, &root) == NOTMUCH_STATUS_SUCCESS) { ++ format_part_reply (root); ++ talloc_free (root); + } ++ + return 0; + } + + static int + notmuch_reply_format_sprinter(void *ctx, + notmuch_config_t *config, +- notmuch_query_t *query, ++ notmuch_message_t *message, + notmuch_show_params_t *params, + notmuch_bool_t reply_all, + sprinter_t *sp) + { + GMimeMessage *reply; +- notmuch_messages_t *messages; +- notmuch_message_t *message; + mime_node_t *node; +- unsigned count; +- notmuch_status_t status; +- +- status = notmuch_query_count_messages_st (query, &count); +- if (print_status_query ("notmuch reply", query, status)) +- return 1; +- +- if (count != 1) { +- fprintf (stderr, "Error: search term did not match precisely one message (matched %d messages).\n", count); +- return 1; +- } + +- status = notmuch_query_search_messages_st (query, &messages); +- if (print_status_query ("notmuch reply", query, status)) +- return 1; +- +- message = notmuch_messages_get (messages); +- if (mime_node_open (ctx, message, &(params->crypto), &node) != NOTMUCH_STATUS_SUCCESS) ++ if (mime_node_open (ctx, message, ¶ms->crypto, &node) != NOTMUCH_STATUS_SUCCESS) + return 1; + + reply = create_reply_message (ctx, config, message, reply_all); +@@ -686,7 +646,6 @@ notmuch_reply_format_sprinter(void *ctx, + sp->map_key (sp, "reply-headers"); + format_headers_sprinter (sp, reply, TRUE); + g_object_unref (G_OBJECT (reply)); +- reply = NULL; + + /* Start the original */ + sp->map_key (sp, "original"); +@@ -694,7 +653,6 @@ notmuch_reply_format_sprinter(void *ctx, + + /* End */ + sp->end (sp); +- notmuch_message_destroy (message); + + return 0; + } +@@ -703,65 +661,48 @@ notmuch_reply_format_sprinter(void *ctx, + static int + notmuch_reply_format_headers_only(void *ctx, + notmuch_config_t *config, +- notmuch_query_t *query, ++ notmuch_message_t *message, + unused (notmuch_show_params_t *params), + notmuch_bool_t reply_all, + unused (sprinter_t *sp)) + { + GMimeMessage *reply; +- notmuch_messages_t *messages; +- notmuch_message_t *message; + const char *in_reply_to, *orig_references, *references; + char *reply_headers; +- notmuch_status_t status; + +- status = notmuch_query_search_messages_st (query, &messages); +- if (print_status_query ("notmuch reply", query, status)) ++ /* The 0 means we do not want headers in a "pretty" order. */ ++ reply = g_mime_message_new (0); ++ if (reply == NULL) { ++ fprintf (stderr, "Out of memory\n"); + return 1; ++ } + +- for (; +- notmuch_messages_valid (messages); +- notmuch_messages_move_to_next (messages)) +- { +- message = notmuch_messages_get (messages); +- +- /* The 0 means we do not want headers in a "pretty" order. */ +- reply = g_mime_message_new (0); +- if (reply == NULL) { +- fprintf (stderr, "Out of memory\n"); +- return 1; +- } +- +- in_reply_to = talloc_asprintf (ctx, "<%s>", +- notmuch_message_get_message_id (message)); +- +- g_mime_object_set_header (GMIME_OBJECT (reply), +- "In-Reply-To", in_reply_to); ++ in_reply_to = talloc_asprintf (ctx, "<%s>", ++ notmuch_message_get_message_id (message)); + ++ g_mime_object_set_header (GMIME_OBJECT (reply), "In-Reply-To", in_reply_to); + +- orig_references = notmuch_message_get_header (message, "references"); ++ orig_references = notmuch_message_get_header (message, "references"); + +- /* We print In-Reply-To followed by References because git format-patch treats them +- * specially. Git does not interpret the other headers specially +- */ +- references = talloc_asprintf (ctx, "%s%s%s", +- orig_references ? orig_references : "", +- orig_references ? " " : "", +- in_reply_to); +- g_mime_object_set_header (GMIME_OBJECT (reply), +- "References", references); ++ /* ++ * We print In-Reply-To followed by References because git ++ * format-patch treats them specially. Git does not interpret the ++ * other headers specially. ++ */ ++ references = talloc_asprintf (ctx, "%s%s%s", ++ orig_references ? orig_references : "", ++ orig_references ? " " : "", ++ in_reply_to); ++ g_mime_object_set_header (GMIME_OBJECT (reply), "References", references); + +- (void)add_recipients_from_message (reply, config, message, reply_all); ++ (void)add_recipients_from_message (reply, config, message, reply_all); + +- reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply)); +- printf ("%s", reply_headers); +- free (reply_headers); ++ reply_headers = g_mime_object_to_string (GMIME_OBJECT (reply)); ++ printf ("%s", reply_headers); ++ free (reply_headers); + +- g_object_unref (G_OBJECT (reply)); +- reply = NULL; ++ g_object_unref (G_OBJECT (reply)); + +- notmuch_message_destroy (message); +- } + return 0; + } + +@@ -772,6 +713,70 @@ enum { + FORMAT_HEADERS_ONLY, + }; + ++static int do_reply(notmuch_config_t *config, ++ notmuch_query_t *query, ++ notmuch_show_params_t *params, ++ int format, ++ notmuch_bool_t reply_all) ++{ ++ notmuch_messages_t *messages; ++ notmuch_message_t *message; ++ notmuch_status_t status; ++ struct sprinter *sp = NULL; ++ int ret = 0; ++ int (*reply_format_func) (void *ctx, ++ notmuch_config_t *config, ++ notmuch_message_t *message, ++ notmuch_show_params_t *params, ++ notmuch_bool_t reply_all, ++ struct sprinter *sp); ++ ++ if (format == FORMAT_JSON || format == FORMAT_SEXP) { ++ unsigned count; ++ ++ status = notmuch_query_count_messages_st (query, &count); ++ if (print_status_query ("notmuch reply", query, status)) ++ return 1; ++ ++ if (count != 1) { ++ fprintf (stderr, "Error: search term did not match precisely one message (matched %d messages).\n", count); ++ return 1; ++ } ++ } ++ ++ if (format == FORMAT_HEADERS_ONLY) { ++ reply_format_func = notmuch_reply_format_headers_only; ++ } else if (format == FORMAT_JSON) { ++ reply_format_func = notmuch_reply_format_sprinter; ++ sp = sprinter_json_create (config, stdout); ++ } else if (format == FORMAT_SEXP) { ++ reply_format_func = notmuch_reply_format_sprinter; ++ sp = sprinter_sexp_create (config, stdout); ++ } else { ++ reply_format_func = notmuch_reply_format_default; ++ } ++ ++ status = notmuch_query_search_messages_st (query, &messages); ++ if (print_status_query ("notmuch reply", query, status)) ++ return 1; ++ ++ for (; ++ notmuch_messages_valid (messages); ++ notmuch_messages_move_to_next (messages)) ++ { ++ message = notmuch_messages_get (messages); ++ ++ ret = reply_format_func(config, config, message, params, reply_all, sp); ++ ++ notmuch_message_destroy (message); ++ ++ if (ret) ++ break; ++ } ++ ++ return ret; ++} ++ + int + notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + { +@@ -779,12 +784,6 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + notmuch_query_t *query; + char *query_string; + int opt_index; +- int (*reply_format_func) (void *ctx, +- notmuch_config_t *config, +- notmuch_query_t *query, +- notmuch_show_params_t *params, +- notmuch_bool_t reply_all, +- struct sprinter *sp); + notmuch_show_params_t params = { + .part = -1, + .crypto = { +@@ -795,7 +794,6 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + }; + int format = FORMAT_DEFAULT; + int reply_all = TRUE; +- struct sprinter *sp = NULL; + + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &format, "format", 'f', +@@ -820,18 +818,6 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + + notmuch_process_shared_options (argv[0]); + +- if (format == FORMAT_HEADERS_ONLY) { +- reply_format_func = notmuch_reply_format_headers_only; +- } else if (format == FORMAT_JSON) { +- reply_format_func = notmuch_reply_format_sprinter; +- sp = sprinter_json_create (config, stdout); +- } else if (format == FORMAT_SEXP) { +- reply_format_func = notmuch_reply_format_sprinter; +- sp = sprinter_sexp_create (config, stdout); +- } else { +- reply_format_func = notmuch_reply_format_default; +- } +- + notmuch_exit_if_unsupported_format (); + + query_string = query_string_from_args (config, argc-opt_index, argv+opt_index); +@@ -859,7 +845,7 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[]) + return EXIT_FAILURE; + } + +- if (reply_format_func (config, config, query, ¶ms, reply_all, sp) != 0) ++ if (do_reply (config, query, ¶ms, format, reply_all) != 0) + return EXIT_FAILURE; + + notmuch_crypto_cleanup (¶ms.crypto); +-- +2.1.4 +