Merge remote-tracking branch 'origin/master'

[mmh] / uip / spost.c

diff --git a/uip/spost.c b/uip/spost.c
index ee70385..4d0b48a 100644 (file)
--- a/uip/spost.c
+++ b/uip/spost.c
@@ -184,17 +184,20 @@ main(int argc, char **argv)
                                continue;
                        }
                }
-               if (msg)
+               if (msg) {
                        adios(EX_USAGE, NULL, "only one message at a time!");
-               else
+               } else {
                        msg = cp;
+               }
        }
 
-       if (!msg)
+       if (!msg) {
                adios(EX_USAGE, NULL, "usage: %s [switches] file", invo_name);
+       }
 
-       if ((in = fopen(msg, "r")) == NULL)
+       if ((in = fopen(msg, "r")) == NULL) {
                adios(EX_IOERR, msg, "unable to open");
+       }
 
        if (debug) {
                verbose++;
@@ -322,12 +325,17 @@ putfmt(char *name, char *str, FILE *out)
 
        if ((i = get_header(name, hdrtab)) == NOTOK) {
                /* no header we would care for */
-               if (mh_strcasecmp(name, attach_hdr)!=0 &&
-                               mh_strcasecmp(name, sign_hdr)!=0 &&
-                               mh_strcasecmp(name, enc_hdr)!=0) {
-                       /* push it through */
-                       fprintf(out, "%s: %s", name, str);
+               if (mh_strcasecmp(name, attach_hdr)==0) {
+                       return;
                }
+               if (mh_strcasecmp(name, sign_hdr)==0) {
+                       return;
+               }
+               if (mh_strcasecmp(name, enc_hdr)==0) {
+                       return;
+               }
+               /* push it through */
+               fprintf(out, "%s: %s", name, str);
                return;
        }
        /* it's one of the interesting headers */
@@ -410,12 +418,11 @@ putfmt(char *name, char *str, FILE *out)
        */
 
        if (hdr->set & MFRM) {
-
                struct mailname *mp = NULL;
                struct mailname *my = NULL;
                unsigned int fromcnt = 0;
 
-               /* This is need because the addresse parser hold global state */
+               /* needed because the address parser holds global state */
                ismymbox(NULL);
 
                while ((cp = getname(str)) != NULL) {
@@ -514,7 +521,6 @@ get_header(char *header, struct headers *table)
                        return (h - table);
                }
        }
-
        return NOTOK;
 }
 
@@ -545,7 +551,7 @@ putadr(char *name, struct mailname *nl)
                        /* a local name - see if it's an alias */
                        cp = akvalue(mp->m_mbox);
                        if (cp == mp->m_mbox) {
-                               /* wasn't an alias - use what the user typed */
+                               /* wasn't an alias - use it unchanged */
                                linepos = putone(mp->m_text, linepos, namelen);
                        } else {
                                /* an alias - expand it */
@@ -567,7 +573,7 @@ putadr(char *name, struct mailname *nl)
                                }
                        }
                } else {
-                       /* not a local name - use what the user typed */
+                       /* not a local name - use it unchanged */
                        linepos = putone(mp->m_text, linepos, namelen);
                }
                mp2 = mp;
@@ -580,13 +586,13 @@ putadr(char *name, struct mailname *nl)
 static int
 putone(char *adr, int pos, int indent)
 {
-       register int len;
+       int len;
        static int linepos;
 
        len = strlen(adr);
-       if (pos == indent)
+       if (pos == indent) {
                linepos = pos;
-       else if (linepos+len > OUTPUTLINELEN) {
+       } else if (linepos+len > OUTPUTLINELEN) {
                fprintf(out, ",\n%*s", indent, "");
                linepos = indent;
                pos += indent + 2;