From 6d71dfbec7c6f3bec1c04d18479a87d63c1120ef Mon Sep 17 00:00:00 2001 From: markus schnalke Date: Wed, 1 Feb 2012 00:47:35 +0100 Subject: [PATCH] spost: refactoring; removed -(no)format switches as they were not used. --- uip/spost.c | 105 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/uip/spost.c b/uip/spost.c index 73787f7..3692363 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -26,43 +26,39 @@ struct swit switches[] = { { "filter filterfile", 0 }, #define NFILTSW 1 { "nofilter", 0 }, -#define FRMTSW 2 - { "format", 0 }, -#define NFRMTSW 3 - { "noformat", 0 }, -#define REMVSW 4 +#define REMVSW 2 { "remove", 0 }, -#define NREMVSW 5 +#define NREMVSW 3 { "noremove", 0 }, -#define VERBSW 6 +#define VERBSW 4 { "verbose", 0 }, -#define NVERBSW 7 +#define NVERBSW 5 { "noverbose", 0 }, -#define WATCSW 8 +#define WATCSW 6 { "watch", 0 }, -#define NWATCSW 9 +#define NWATCSW 7 { "nowatch", 0 }, -#define BACKSW 10 +#define BACKSW 8 { "backup", 0 }, -#define NBACKSW 11 +#define NBACKSW 9 { "nobackup", 0 }, -#define ALIASW 12 +#define ALIASW 10 { "alias aliasfile", 0 }, -#define NALIASW 13 +#define NALIASW 11 { "noalias", 0 }, -#define VERSIONSW 14 +#define VERSIONSW 12 { "version", 0 }, -#define HELPSW 15 +#define HELPSW 13 { "help", 0 }, -#define DEBUGSW 16 +#define DEBUGSW 14 { "debug", -5 }, -#define DISTSW 17 +#define DISTSW 15 { "dist", -4 }, /* interface from dist */ -#define PUSHSW 18 /* fork to sendmail then exit */ +#define PUSHSW 16 /* fork to sendmail then exit */ { "push", -4 }, -#define NPUSHSW 19 /* exec sendmail */ +#define NPUSHSW 17 /* exec sendmail */ { "nopush", -6 }, -#define LIBSW 20 +#define LIBSW 19 { "library directory", -7 }, { NULL, 0 } }; @@ -281,7 +277,7 @@ main(int argc, char **argv) argp[-2]); aliasflg = 1; if ((state = alias(cp)) != AK_OK) - adios(NULL, "aliasing error in file %s - %s", cp, akerror(state) ); + adios(NULL, "aliasing error in file %s - %s", cp, akerror(state)); continue; case NALIASW: aliasflg = 0; @@ -313,18 +309,17 @@ main(int argc, char **argv) if (debug) { verbose++; out = stdout; - } - else { + } else { #ifdef HAVE_MKSTEMP - if ((out = fdopen( mkstemp(tmpfil), "w" )) == NULL ) - adios(tmpfil, "unable to create"); + if ((out = fdopen(mkstemp(tmpfil), "w")) == NULL) + adios(tmpfil, "unable to create"); #else - mktemp(tmpfil); - if ((out = fopen(tmpfil, "w")) == NULL) - adios(tmpfil, "unable to create"); - chmod(tmpfil, 0600); + mktemp(tmpfil); + if ((out = fopen(tmpfil, "w")) == NULL) + adios(tmpfil, "unable to create"); + chmod(tmpfil, 0600); #endif - } + } hdrtab = (msgstate == normal) ? NHeaders : RHeaders; @@ -535,7 +530,7 @@ putfmt(char *name, char *str, FILE *out) ** alias processing as well. ** -- Dan Harkless */ - fprintf(out, "%s: %s", name, str ); + fprintf(out, "%s: %s", name, str); } } } @@ -634,34 +629,37 @@ putadr(char *name, struct mailname *nl) if (mp->m_nohost) { /* a local name - see if it's an alias */ cp = akvalue(mp->m_mbox); - if (cp == mp->m_mbox) + if (cp == mp->m_mbox) { /* wasn't an alias - use what the user typed */ linepos = putone(mp->m_text, linepos, namelen); - else + } else { /* an alias - expand it */ while ((cp = getname(cp))) { if (linepos > MAX_SM_FIELD) { - fprintf(out, "\n%s: ", name); - linepos = namelen; + fprintf(out, "\n%s: ", name); + linepos = namelen; } - mp2 = getm( cp, NULL, 0, AD_HOST, NULL); + mp2 = getm(cp, NULL, 0, AD_HOST, NULL); if (akvisible()) { mp2->m_pers = getcpy(mp->m_mbox); - linepos = putone( adrformat(mp2), linepos, namelen ); + linepos = putone(adrformat(mp2), linepos, namelen); } else { - linepos = putone( mp2->m_text, linepos, namelen ); + linepos = putone(mp2->m_text, + linepos, + namelen); } - mnfree( mp2 ); + mnfree(mp2); } + } } else { /* not a local name - use what the user typed */ - linepos = putone( mp->m_text, linepos, namelen ); + linepos = putone(mp->m_text, linepos, namelen); } mp2 = mp; mp = mp->m_next; - mnfree( mp2 ); + mnfree(mp2); } - putc( '\n', out ); + putc('\n', out); } static int @@ -670,19 +668,19 @@ putone(char *adr, int pos, int indent) register int len; static int linepos; - len = strlen( adr ); + len = strlen(adr); if (pos == indent) linepos = pos; else if (linepos+len > OUTPUTLINELEN) { - fprintf( out, ",\n%*s", indent, ""); + fprintf(out, ",\n%*s", indent, ""); linepos = indent; pos += indent + 2; } else { - fputs( ", ", out ); + fputs(", ", out); linepos += 2; pos += 2; } - fputs( adr, out ); + fputs(adr, out); linepos += len; return (pos+len); @@ -734,9 +732,10 @@ make_bcc_file(void) chmod(bccfil, 0600); fprintf(out, "Date: %s\n", dtimenow(0)); - if (msgflags & MFRM) { - /* There was already a From: in the draft. Don't add one. */ - if (!draft_from_masquerading) + if (!(msgflags & MFRM)) { + /* Construct a From: header. */ + fprintf(out, "From: %s\n", signature); + } else if (!draft_from_masquerading) { /* ** mts.conf didn't contain "masquerade:[...]draft_from[...]" ** so we'll reveal the user's actual account@thismachine @@ -744,15 +743,13 @@ make_bcc_file(void) ** From: later). */ fprintf(out, "Sender: %s\n", from); - } else - /* Construct a From: header. */ - fprintf(out, "From: %s\n", signature); + } if (subject) fprintf(out, "Subject: %s", subject); fprintf(out, "BCC:\n\n------- Blind-Carbon-Copy\n\n"); fflush(out); - if (filter == NULL) { + if (!filter) { if ((fd = open(tmpfil, O_RDONLY)) == NOTOK) adios(NULL, "unable to re-open"); cpydgst(fd, fileno(out), tmpfil, bccfil); -- 1.7.10.4