From: Aneesh Kumar K.V Date: Wed, 10 Mar 2010 16:31:25 +0000 (+0530) Subject: [notmuch] [PATCH -V3 1/2] notmuch-reply: Add support for replying only to sender X-Git-Url: http://git.tremily.us/?p=notmuch-archives.git;a=commitdiff_plain;h=fed9627de4f272978d46ee752916f5f61aa2b97f [notmuch] [PATCH -V3 1/2] notmuch-reply: Add support for replying only to sender --- diff --git a/74/d0549dd8cdc86ab2ff987008c9880d900924fd b/74/d0549dd8cdc86ab2ff987008c9880d900924fd new file mode 100644 index 000000000..7ae8ee152 --- /dev/null +++ b/74/d0549dd8cdc86ab2ff987008c9880d900924fd @@ -0,0 +1,214 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0CB8D4916AE + for ; Wed, 10 Mar 2010 08:31:54 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -5.186 +X-Spam-Level: +X-Spam-Status: No, score=-5.186 tagged_above=-999 required=5 tests=[AWL=1.413, + BAYES_00=-2.599, RCVD_IN_DNSWL_MED=-4] autolearn=unavailable +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id J5LAZKI3sq37 for ; + Wed, 10 Mar 2010 08:31:51 -0800 (PST) +Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) + by olra.theworths.org (Postfix) with ESMTP id 350884916B5 + for ; Wed, 10 Mar 2010 08:31:50 -0800 (PST) +Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [202.81.31.247]) + by e23smtp07.au.ibm.com (8.14.3/8.13.1) with ESMTP id o2AGVV6r010202 + for ; Thu, 11 Mar 2010 03:31:31 +1100 +Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) + by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id + o2AGPhwl1630298 + for ; Thu, 11 Mar 2010 03:25:44 +1100 +Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) + by d23av04.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id + o2AGVTOn008214 + for ; Thu, 11 Mar 2010 03:31:30 +1100 +Received: from localhost.localdomain ([9.124.221.30]) + by d23av04.au.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id + o2AGVSYe008190; Thu, 11 Mar 2010 03:31:28 +1100 +From: "Aneesh Kumar K.V" +To: cworth@cworth.org +Date: Wed, 10 Mar 2010 22:01:25 +0530 +Message-Id: + <1268238686-13605-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> +X-Mailer: git-send-email 1.7.0.2.157.gb7e7f +In-Reply-To: <87zl2hic7d.fsf@yoom.home.cworth.org> +References: <87zl2hic7d.fsf@yoom.home.cworth.org> +Cc: "Aneesh Kumar K.V" , notmuch@notmuchmail.org +Subject: [notmuch] [PATCH -V3 1/2] notmuch-reply: Add support for replying + only to sender +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Wed, 10 Mar 2010 16:31:54 -0000 + +From: Aneesh Kumar K.V + +This patch add --recipient=all|sender option + +Signed-off-by: Aneesh Kumar K.V +--- + notmuch-client.h | 2 + + notmuch-reply.c | 55 ++++++++++++++++++++++++++++++++++++++++------------- + 2 files changed, 43 insertions(+), 14 deletions(-) + +diff --git a/notmuch-client.h b/notmuch-client.h +index c80b39c..26fdb4a 100644 +--- a/notmuch-client.h ++++ b/notmuch-client.h +@@ -70,6 +70,8 @@ + #define STRNCMP_LITERAL(var, literal) \ + strncmp ((var), (literal), sizeof (literal) - 1) + ++#define NOTMUCH_REPLY_ALL 0x1 ++#define NOTMUCH_REPLY_SENDER_ONLY 0x2 + static inline void + chomp_newline (char *str) + { +diff --git a/notmuch-reply.c b/notmuch-reply.c +index 6c15536..e8a0820 100644 +--- a/notmuch-reply.c ++++ b/notmuch-reply.c +@@ -232,20 +232,37 @@ reply_to_header_is_redundant (notmuch_message_t *message) + static const char * + add_recipients_from_message (GMimeMessage *reply, + notmuch_config_t *config, +- notmuch_message_t *message) ++ notmuch_message_t *message, ++ int reply_options) + { +- struct { ++ struct reply_to_map { + const char *header; + const char *fallback; + GMimeRecipientType recipient_type; +- } reply_to_map[] = { ++ } ; ++ const char *from_addr = NULL; ++ unsigned int i; ++ struct reply_to_map *reply_to_map; ++ ++ struct reply_to_map reply_to_map_all[] = { + { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO }, + { "to", NULL, GMIME_RECIPIENT_TYPE_TO }, + { "cc", NULL, GMIME_RECIPIENT_TYPE_CC }, +- { "bcc", NULL, GMIME_RECIPIENT_TYPE_BCC } ++ { "bcc", NULL, GMIME_RECIPIENT_TYPE_BCC }, ++ { NULL, NULL, 0 } + }; +- const char *from_addr = NULL; +- unsigned int i; ++ ++ /* we try from first and then reply-to */ ++ struct reply_to_map reply_to_map_sender[] = { ++ { "from", "reply-to", GMIME_RECIPIENT_TYPE_TO }, ++ { NULL, NULL, 0 } ++ }; ++ ++ if (reply_options == NOTMUCH_REPLY_SENDER_ONLY) { ++ reply_to_map = reply_to_map_sender; ++ } else { ++ reply_to_map = reply_to_map_all; ++ } + + /* Some mailing lists munge the Reply-To header despite it being A Bad + * Thing, see http://www.unicom.com/pw/reply-to-harmful.html +@@ -263,7 +280,7 @@ add_recipients_from_message (GMimeMessage *reply, + reply_to_map[0].fallback = NULL; + } + +- for (i = 0; i < ARRAY_SIZE (reply_to_map); i++) { ++ for (i = 0; reply_to_map[i].header; i++) { + const char *addr, *recipients; + + recipients = notmuch_message_get_header (message, +@@ -283,7 +300,7 @@ add_recipients_from_message (GMimeMessage *reply, + } + + static int +-notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query) ++notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query, int reply_options) + { + GMimeMessage *reply; + notmuch_messages_t *messages; +@@ -311,7 +328,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ + subject = talloc_asprintf (ctx, "Re: %s", subject); + g_mime_message_set_subject (reply, subject); + +- from_addr = add_recipients_from_message (reply, config, message); ++ from_addr = add_recipients_from_message (reply, config, message, reply_options); + + if (from_addr == NULL) + from_addr = notmuch_config_get_user_primary_email (config); +@@ -359,7 +376,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_ + + /* This format is currently tuned for a git send-email --notmuch hook */ + static int +-notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_query_t *query) ++notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_query_t *query, int reply_options) + { + GMimeMessage *reply; + notmuch_messages_t *messages; +@@ -399,7 +416,7 @@ notmuch_reply_format_headers_only(void *ctx, notmuch_config_t *config, notmuch_q + g_mime_object_set_header (GMIME_OBJECT (reply), + "References", references); + +- (void)add_recipients_from_message (reply, config, message); ++ (void)add_recipients_from_message (reply, config, message, reply_options); + + g_mime_object_set_header (GMIME_OBJECT (reply), "Bcc", + notmuch_config_get_user_primary_email (config)); +@@ -423,8 +440,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + notmuch_database_t *notmuch; + notmuch_query_t *query; + char *opt, *query_string; +- int i, ret = 0; +- int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query); ++ int i, ret = 0, reply_to = NOTMUCH_REPLY_ALL; ++ int (*reply_format_func)(void *ctx, notmuch_config_t *config, notmuch_query_t *query, int reply_options); + + reply_format_func = notmuch_reply_format_default; + +@@ -443,6 +460,16 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + fprintf (stderr, "Invalid value for --format: %s\n", opt); + return 1; + } ++ } else if (STRNCMP_LITERAL (argv[i], "--recipient=") == 0) { ++ opt = argv[i] + sizeof ("--recipient=") - 1; ++ if (strcmp (opt, "all") == 0) { ++ reply_to = NOTMUCH_REPLY_ALL; ++ } else if (strcmp (opt, "sender") == 0) { ++ reply_to = NOTMUCH_REPLY_SENDER_ONLY; ++ } else { ++ fprintf (stderr, "Invalid value for --recipient: %s\n", opt); ++ return 1; ++ } + } else { + fprintf (stderr, "Unrecognized option: %s\n", argv[i]); + return 1; +@@ -478,7 +505,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[]) + return 1; + } + +- if (reply_format_func (ctx, config, query) != 0) ++ if (reply_format_func (ctx, config, query, reply_to) != 0) + return 1; + + notmuch_query_destroy (query); +-- +1.7.0.2.157.gb7e7f +