Decode headers in reply

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 3c5b253e0c15ad99a3dd6e8a8636464536f9c78c..230cacc34fc539f1c1714ee83f0c86738a99ddbf 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -22,6 +22,7 @@
 
 #include "notmuch-client.h"
 #include "gmime-filter-reply.h"
+#include "gmime-filter-headers.h"
 
 static void
 reply_part_content (GMimeObject *part)
@@ -51,6 +52,25 @@ reply_part_content (GMimeObject *part)
        g_object_unref(stream_stdout);
 }
 
+static void
+show_reply_headers (GMimeMessage *message)
+{
+    GMimeStream *stream_stdout = NULL, *stream_filter = NULL;
+
+    stream_stdout = g_mime_stream_file_new (stdout);
+    if (stream_stdout) {
+       g_mime_stream_file_set_owner (GMIME_STREAM_FILE (stream_stdout), FALSE);
+       stream_filter = g_mime_stream_filter_new(stream_stdout);
+       if (stream_filter) {
+               g_mime_stream_filter_add(GMIME_STREAM_FILTER(stream_filter),
+                                        g_mime_filter_headers_new());
+               g_mime_object_write_to_stream(GMIME_OBJECT(message), stream_filter);
+               g_object_unref(stream_filter);
+       }
+       g_object_unref(stream_stdout);
+    }
+}
+
 static void
 reply_part (GMimeObject *part, int *part_count)
 {
@@ -282,9 +302,8 @@ add_recipients_from_message (GMimeMessage *reply,
     return from_addr;
 }
 
-
 static const char *
-guess_from_received_header(notmuch_config_t *config, notmuch_message_t *message)
+guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
 {
     const char *received,*primary;
     char **other;
@@ -295,34 +314,32 @@ guess_from_received_header(notmuch_config_t *config, notmuch_message_t *message)
     size_t i,other_len;
 
     received = notmuch_message_get_header (message, "received");
-    by = strstr(received," by ");
+    by = strstr (received, " by ");
     if (by && *(by+4)) {
-       /* we know that there are 4 characters after by - either the 4th one
-        * is '\0' (broken header) or it is the first letter of the hostname 
-        * that last received this email - which we'll use to guess the right
-        * from email address
+       /* sadly, the format of Received: headers is a bit inconsistent,
+        * depending on the MTA used. So we try to extract just the MTA
+        * here by removing leading whitespace and assuming that the MTA
+        * name ends at the next whitespace
+        * we test for *(by+4) to be non-'\0' to make sure there's something
+        * there at all - and then assume that the first whitespace delimited
+        * token that follows is the last receiving server
         */
-       mta = strdup(by+4);
+       mta = strdup (by+4);
        if (mta == NULL)
            return NULL;
-       /* After the MTA comes its IP address (or HELO response) in parenthesis.
-        * so let's terminate the string there
-        */
-       if ((ptr = strchr(mta,'(')) == NULL) {
-           free (mta);
+       token = strtok(mta," \t");
+       if (token == NULL)
            return NULL;
-       }
-       *ptr = '\0';
        /* Now extract the last two components of the MTA host name
         * as domain and tld
         */
-       token = mta;
-       while ((ptr = strsep(&token,delim)) != NULL) {
+       while ((ptr = strsep (&token, delim)) != NULL) {
            if (*ptr == '\0')
                continue;
            domain = tld;
            tld = ptr;
        }
+
        if (domain) {
            /* recombine domain and tld and look for it among the configured
             * email addresses
@@ -330,18 +347,20 @@ guess_from_received_header(notmuch_config_t *config, notmuch_message_t *message)
            *(tld-1) = '.';
            primary = notmuch_config_get_user_primary_email (config);
            if (strcasestr (primary, domain)) {
-               free(mta);
+               free (mta);
                return primary;
            }
            other = notmuch_config_get_user_other_email (config, &other_len);
            for (i = 0; i < other_len; i++)
                if (strcasestr (other[i], domain)) {
-                   free(mta);
+                   free (mta);
                    return other[i];
                }
        }
-       free(mta);
+
+       free (mta);
     }
+
     return NULL;
 }
 
@@ -353,7 +372,6 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
     notmuch_message_t *message;
     const char *subject, *from_addr = NULL;
     const char *in_reply_to, *orig_references, *references;
-    char *reply_headers;
 
     for (messages = notmuch_query_search_messages (query);
         notmuch_messages_valid (messages);
@@ -369,19 +387,17 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
        }
 
        subject = notmuch_message_get_header (message, "subject");
-
        if (strncasecmp (subject, "Re:", 3))
            subject = talloc_asprintf (ctx, "Re: %s", subject);
        g_mime_message_set_subject (reply, subject);
 
        from_addr = add_recipients_from_message (reply, config, message);
-       
-       if (from_addr == NULL) {
+
+       if (from_addr == NULL)
            from_addr = guess_from_received_header (config, message);
-           if (from_addr == NULL) {
-               from_addr = notmuch_config_get_user_primary_email (config);
-           }
-       }
+
+       if (from_addr == NULL)
+           from_addr = notmuch_config_get_user_primary_email (config);
 
        from_addr = talloc_asprintf (ctx, "%s <%s>",
                                     notmuch_config_get_user_name (config),
@@ -406,9 +422,7 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
        g_mime_object_set_header (GMIME_OBJECT (reply),
                                  "References", references);
 
-       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;