OpenBSD port patches.

[~andy/fetchmail] / rfc822.c

diff --git a/rfc822.c b/rfc822.c
index 0081cff20cddce335ddc30a224a00b26a1693adb..9195d9bfc7c676d5189396fc8b85dd00027c641f 100644 (file)
--- a/rfc822.c
+++ b/rfc822.c
@@ -12,12 +12,14 @@
 #include  <stdlib.h>
 #endif
 
+#include "config.h"
 #include "fetchmail.h"
 
 #define HEADER_END(p)  ((p)[0] == '\n' && ((p)[1] != ' ' && (p)[1] != '\t'))
 
 #ifdef TESTMAIN
 static int verbose;
+char *program_name = "rfc822";
 #endif /* TESTMAIN */
 
 char *reply_hack(buf, host)
@@ -25,20 +27,34 @@ char *reply_hack(buf, host)
 char *buf;             /* header to be hacked */
 const char *host;      /* server hostname */
 {
-    char *from, *cp, last_nws = '\0';
+    char *from, *cp, last_nws = '\0', *parens_from = NULL;
     int parendepth, state, has_bare_name_part, has_host_part;
+#ifndef TESTMAIN
     int addresscount = 1;
+#endif /* TESTMAIN */
 
     if (strncasecmp("From: ", buf, 6)
        && strncasecmp("To: ", buf, 4)
        && strncasecmp("Reply-To: ", buf, 10)
        && strncasecmp("Return-Path: ", buf, 13)
        && strncasecmp("Cc: ", buf, 4)
-       && strncasecmp("Bcc: ", buf, 5)) {
+       && strncasecmp("Bcc: ", buf, 5)
+       && strncasecmp("Resent-From: ", buf, 13)
+       && strncasecmp("Resent-To: ", buf, 11)
+       && strncasecmp("Resent-Cc: ", buf, 11)
+       && strncasecmp("Resent-Bcc: ", buf, 12)
+       && strncasecmp("Apparently-From:", buf, 16)
+       && strncasecmp("Apparently-To:", buf, 14)
+       && strncasecmp("Sender:", buf, 7)
+       && strncasecmp("Resent-Sender:", buf, 14)
+       ) {
        return(buf);
     }
 
 #ifndef TESTMAIN
+    if (outlevel >= O_DEBUG)
+       report_build(stdout, "About to rewrite %s", buf);
+
     /* make room to hack the address; buf must be malloced */
     for (cp = buf; *cp; cp++)
        if (*cp == ',' || isspace(*cp))
@@ -46,6 +62,12 @@ const char *host;    /* server hostname */
     buf = (char *)xrealloc(buf, strlen(buf) + addresscount * strlen(host) + 1);
 #endif /* TESTMAIN */
 
+    /*
+     * This is going to foo up on some ill-formed addresses.
+     * Note that we don't rewrite the fake address <> in order to
+     * avoid screwing up bounce suppression with a null Return-Path.
+     */
+
     parendepth = state = 0;
     has_host_part = has_bare_name_part = FALSE;
     for (from = buf; *from; from++)
@@ -85,13 +107,17 @@ const char *host;  /* server hostname */
                 * an obscure misfeature described in sections
                 * 6.1, 6.2.6, and A.1.5 of the RFC822 standard.
                 */
-               else if ((*from == ',' || HEADER_END(from) || from[1] == '(')
+               else if ((*from == ',' || HEADER_END(from))
                         && has_bare_name_part
                         && !has_host_part
-                        && last_nws != ';' && last_nws != ')')
+                        && last_nws != ';')
                {
                    int hostlen;
+                   char *p;
 
+                   p = from;
+                   if (parens_from)
+                       from = parens_from;
                    while (isspace(*from) || (*from == ','))
                        --from;
                    from++;
@@ -100,9 +126,16 @@ const char *host;  /* server hostname */
                        cp[hostlen+1] = *cp;
                    *from++ = '@';
                    memcpy(from, host, hostlen);
-                   from += hostlen;
+                   from = p + hostlen + 1;
                    has_host_part = TRUE;
                } 
+               else if (from[1] == '('
+                        && has_bare_name_part
+                        && !has_host_part
+                        && last_nws != ';' && last_nws != ')')
+               {
+                   parens_from = from;
+               } 
                else if (!isspace(*from))
                    has_bare_name_part = TRUE;
                break;
@@ -115,7 +148,7 @@ const char *host;   /* server hostname */
            case 3:     /* we're in a <>-enclosed address */
                if (*from == '@')
                    has_host_part = TRUE;
-               else if (*from == '>')
+               else if (*from == '>' && from[-1] != '<')
                {
                    state = 1;
                    if (!has_host_part)
@@ -139,9 +172,14 @@ const char *host;  /* server hostname */
         */
        if (from[-1] == ',' && !parendepth) {
          has_host_part = has_bare_name_part = FALSE;
+         parens_from = NULL;
        }
     }
 
+#ifndef TESTMAIN
+    if (outlevel >= O_DEBUG)
+       report_complete(stdout, "Rewritten version is %s\n", buf);
+#endif /* TESTMAIN */
     return(buf);
 }