]> git.notmuchmail.org Git - notmuch/blobdiff - notmuch-reply.c
cli/reply: reuse show_reply_headers() in headers-only format
[notmuch] / notmuch-reply.c
index 6df54fc992bb39b2f61e115b83f53555e05c00a0..5adbab624ad7a2cbb17a6a7b5a98b8feca8937f7 100644 (file)
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see http://www.gnu.org/licenses/ .
+ * along with this program.  If not, see https://www.gnu.org/licenses/ .
  *
  * Authors: Carl Worth <cworth@cworth.org>
  *         Keith Packard <keithp@keithp.com>
@@ -324,7 +324,7 @@ add_recipients_from_message (GMimeMessage *reply,
     unsigned int n = 0;
 
     /* Some mailing lists munge the Reply-To header despite it being A Bad
-     * Thing, see http://www.unicom.com/pw/reply-to-harmful.html
+     * Thing, see http://marc.merlins.org/netrants/reply-to-harmful.html
      *
      * The munging is easy to detect, because it results in a
      * redundant reply-to header, (with an address that already exists
@@ -332,7 +332,7 @@ add_recipients_from_message (GMimeMessage *reply,
      * field and use the From header. This ensures the original sender
      * will get the reply even if not subscribed to the list. Note
      * that the address in the Reply-To header will always appear in
-     * the reply.
+     * the reply if reply_all is true.
      */
     if (reply_to_header_is_redundant (message)) {
        reply_to_map[0].header = "from";
@@ -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, &params->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.\n");
-       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, &params->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,45 @@ 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);
+    show_reply_headers (reply);
 
-       g_object_unref (G_OBJECT (reply));
-       reply = NULL;
+    g_object_unref (G_OBJECT (reply));
 
-       notmuch_message_destroy (message);
-    }
     return 0;
 }
 
@@ -772,6 +710,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 +781,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 +791,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 +815,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 +842,7 @@ notmuch_reply_command (notmuch_config_t *config, int argc, char *argv[])
        return EXIT_FAILURE;
     }
 
-    if (reply_format_func (config, config, query, &params, reply_all, sp) != 0)
+    if (do_reply (config, query, &params, format, reply_all) != 0)
        return EXIT_FAILURE;
 
     notmuch_crypto_cleanup (&params.crypto);