remove variable mp2 from spost in putadr

[mmh] / uip / spost.c

diff --git a/uip/spost.c b/uip/spost.c
index 3a70f36..d682318 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -49,6 +49,7 @@ static struct swit switches[] = {
 #define HBCC  0x0010  /* don't output this header */
 #define HFCC  0x0020  /* FCC: type header */
 #define HIGN  0x0040  /* ignore this header */
+#define HDCC  0x0080  /* DCC: type header */
 
 /* flags for headers->set */
 #define MFRM  0x0001  /* we've seen a From: */
@@ -75,6 +76,7 @@ static struct headers NHeaders[] = {
        { "Subject", HSUB, 0 },
        { "To", HADR|HTRY, MVIS },
        { "Cc", HADR|HTRY, MVIS },
+       { "Dcc", HADR|HTRY|HDCC, MINV },
        { "Bcc", HADR|HTRY|HBCC, MINV },
        { "Message-Id", HBAD, 0 },
        { "Fcc", HFCC, 0 },
@@ -90,6 +92,7 @@ static struct headers RHeaders[] = {
        { "Resent-Subject", HSUB, 0 },
        { "Resent-To", HADR|HTRY, MVIS },
        { "Resent-Cc", HADR|HTRY, MVIS },
+       { "Resent-Dcc", HADR|HTRY|HDCC, MINV },
        { "Resent-Bcc", HADR|HTRY|HBCC, MINV },
        { "Resent-Message-Id", HBAD, 0 },
        { "Resent-Fcc", HFCC, 0 },
@@ -443,7 +446,9 @@ putfmt(char *name, char *str, FILE *out)
                }
        }
 
-       putadr(name, addr_start.m_next);
+       if (!(hdr->flags & HDCC)) {
+               putadr(name, addr_start.m_next);
+       }
 
        if (hdr->flags & HTRY) {
                addr_end->m_next = recipients;
@@ -526,7 +531,7 @@ get_header(char *header, struct headers *table)
 static void
 putadr(char *name, struct mailname *nl)
 {
-       struct mailname *mp, *mp2;
+       struct mailname *mp;
        int linepos;
        int namelen;
 
@@ -540,7 +545,6 @@ putadr(char *name, struct mailname *nl)
                        linepos = namelen;
                }
                linepos = putone(mp->m_text, linepos, namelen);
-               mp2 = mp;
                mp = mp->m_next;
        }
        putc('\n', out);