Makefile: Make emacs compilation depend on global dependencies.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 514bbc642654b8bcf3f352e6e9514ffe4ee7fb4b..362e19872f6061192fbf2280f45ae7fd4eb8019f 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -278,7 +278,7 @@ add_recipients_from_message (GMimeMessage *reply,
      * The munging is easy to detect, because it results in a
      * redundant reply-to header, (with an address that already exists
      * in either To or Cc). So in this case, we ignore the Reply-To
-     * field and use the From header. Thie ensures the original sender
+     * 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.
@@ -362,7 +362,7 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
      * them indications to which email address this message was
      * delivered.
      * The Received: header is special in our get_header function
-     * and is always concated.
+     * and is always concatenated.
      */
     received = notmuch_message_get_header (message, "received");
     if (received == NULL)
@@ -401,11 +401,14 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
            break;
        mta = xstrdup (by);
        token = strtok(mta," \t");
-       if (token == NULL)
+       if (token == NULL) {
+           free (mta);
            break;
+       }
        /* Now extract the last two components of the MTA host name
         * as domain and tld.
         */
+       domain = tld = NULL;
        while ((ptr = strsep (&token, delim)) != NULL) {
            if (*ptr == '\0')
                continue;
@@ -424,13 +427,13 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message
 
            if (strcasestr(primary, domain)) {
                free(mta);
-           return primary;
-       }
-       for (i = 0; i < other_len; i++)
-           if (strcasestr (other[i],domain)) {
-               free(mta);
-               return other[i];
+               return primary;
            }
+           for (i = 0; i < other_len; i++)
+               if (strcasestr (other[i],domain)) {
+                   free(mta);
+                   return other[i];
+               }
        }
        free (mta);
     }