X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e6d87a04919616cf2a6ea6cbda81d5fbc31cc8a2..9291a5f82480f2458e04cb9ea7e6749bc952b308:/uip/post.c diff --git a/uip/post.c b/uip/post.c index d385219e..3fd1fff0 100644 --- a/uip/post.c +++ b/uip/post.c @@ -1,28 +1,41 @@ -/* - * post.c -- enter messages into the mail transport system +/* post.c -- enter messages into the mail transport system * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. */ -#include +#include "h/mh.h" +#include "sbr/cpydata.h" +#include "sbr/cpydgst.h" +#include "sbr/uprf.h" +#include "sbr/context_foil.h" +#include "sbr/readconfig.h" +#include "sbr/ambigsw.h" +#include "sbr/pidstatus.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/arglist.h" +#include "sbr/error.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "h/signals.h" +#include "h/addrsbr.h" +#include "h/aliasbr.h" +#include "h/dropsbr.h" +#include "h/mime.h" +#include "h/done.h" +#include "h/utils.h" +#include "h/tws.h" +#include "h/mts.h" +#include "sbr/m_mktemp.h" +#include "sbr/message_id.h" #ifdef HAVE_SYS_TIME_H # include #endif #include -#include +#include "mts/smtp/smtp.h" #ifndef CYRUS_SASL # define SASLminc(a) (a) @@ -89,6 +102,8 @@ X("tls", TLSminc(-3), TLSSW) \ X("initialtls", TLSminc(-10), INITTLSSW) \ X("notls", TLSminc(-5), NTLSSW) \ + X("certverify", TLSminc(-10), CERTVERSW) \ + X("nocertverify", TLSminc(-12), NOCERTVERSW) \ X("fileproc", -4, FILEPROCSW) \ X("mhlproc", -3, MHLPROCSW) \ X("sendmail program", 0, MTSSM) \ @@ -118,7 +133,7 @@ DEFINE_SWITCH_ARRAY(POST, switches); * from 'send'. We use a service name of 'post' internally. */ -static struct oauth_profile { +static struct { const char *profname; int switchnum; const char *value; @@ -168,7 +183,7 @@ struct headers { #define MVIS 0x0008 /* we've seen sighted addrs */ #define MINV 0x0010 /* we've seen blind addrs */ #define MSND 0x0020 /* we've seen a Sender: */ -#define MRSN 0x0040 /* We've seen a Resent-Sendr:*/ +#define MRSN 0x0040 /* We've seen a Resent-Sender: */ #define MEFM 0x0080 /* We've seen Envelope-From: */ #define MMIM 0x0100 /* We've seen Mime-Version: */ @@ -221,27 +236,27 @@ static short fccind = 0; /* index into fccfold[] */ static short outputlinelen = OUTPUTLINELEN; static int pfd = NOTOK; /* fd to write annotation list to */ -static int recipients = 0; /* how many people will get a copy */ +static bool recipients; /* how many people will get a copy */ static int unkadr = 0; /* how many of those were unknown */ static int badadr = 0; /* number of bad addrs */ -static int badmsg = 0; /* message has bad semantics */ -static int verbose = 0; /* spell it out */ -static int format = 1; /* format addresses */ -static int mime = 0; /* use MIME-style encapsulations for Bcc */ -static int msgid = 0; /* add msgid */ -static int debug = 0; /* debugging post */ -static int watch = 0; /* watch the delivery process */ -static int whomsw = 0; /* we are whom not post */ -static int checksw = 0; /* whom -check */ +static bool badmsg; /* message has bad semantics */ +static bool verbose; /* spell it out */ +static bool format = true; /* format addresses */ +static bool mime; /* use MIME-style encapsulations for Bcc */ +static bool msgid; /* add msgid */ +static bool debug; /* debugging post */ +static bool watch; /* watch the delivery process */ +static bool whomsw; /* we are whom not post */ +static bool checksw; /* whom -check */ static int linepos=0; /* putadr()'s position on the line */ static int nameoutput=0; /* putadr() has output header name */ -static int sasl=0; /* Use SASL auth for SMTP */ +static bool sasl; /* Use SASL auth for SMTP */ static char *saslmech=NULL; /* Force use of particular SASL mech */ static char *user=NULL; /* Authenticate as this user */ static char *port="submission"; /* Name of server port for SMTP submission */ -static int tls=-1; /* Use TLS for encryption */ +static int tlsflag=0; /* Flags to control TLS settings */ static int fromcount=0; /* Count of addresses on From: header */ -static int seensender=0; /* Have we seen a Sender: header? */ +static bool seensender; /* Have we seen a Sender: header? */ static unsigned msgflags = 0; /* what we've seen */ @@ -273,7 +288,7 @@ static struct mailname netaddrs; /* network addrs */ static struct mailname uuaddrs; /* uucp addrs */ static struct mailname tmpaddrs; /* temporary queue */ -static int snoop = 0; +static bool snoop; static char *clientsw = NULL; static char *serversw = NULL; @@ -287,8 +302,9 @@ static char *partno = NULL; static void putfmt (char *, char *, int *, FILE *); static void start_headers (void); static void finish_headers (FILE *); -static int get_header (char *, struct headers *); -static int putadr (char *, char *, struct mailname *, FILE *, unsigned int); +static int get_header (char *, struct headers *) PURE; +static int putadr (char *, char *, struct mailname *, FILE *, unsigned int, + char *, unsigned int); static void putgrp (char *, char *, FILE *, unsigned int); static int insert (struct mailname *); static void pl (void); @@ -297,12 +313,12 @@ static int annoaux (struct mailname *); static void insert_fcc (struct headers *, char *); static void make_bcc_file (int); static void verify_all_addresses (int, int, char *, int, char *); -static void chkadr (void); +static void chkadr (void) PURE; static void sigon (void); static void sigoff (void); static void p_refile (char *); static void fcc (char *, char *); -static void die (char *, char *, ...); +static void fatal (char *, char *, ...) CHECK_PRINTF(2, 3); static void post (char *, int, int, int, char *, int, char *); static void do_text (char *file, int fd); static void do_an_address (struct mailname *, int); @@ -313,14 +329,17 @@ static int find_prefix (void); int main (int argc, char **argv) { - int state, compnum, dashstuff = 0, swnum, oauth_flag = 0; + int state, compnum, dashstuff = 0, swnum; + bool oauth_flag = false; + int tls = -1; + bool noverify = false; int eai = 0; /* use Email Address Internationalization (EAI) (SMTPUTF8) */ char *cp, *msg = NULL, **argp, **arguments, *envelope; - char buf[BUFSIZ], name[NAMESZ], *auth_svc = NULL; + char buf[NMH_BUFSIZ], name[NAMESZ], *auth_svc = NULL; FILE *in, *out; - m_getfld_state_t gstate = 0; + m_getfld_state_t gstate; - if (nmh_init(argv[0], 0 /* use context_foil() */)) { return 1; } + if (nmh_init(argv[0], false, false)) { return 1; } mts_init (); arguments = getarguments (invo_name, argc, argv, 0); @@ -333,7 +352,7 @@ main (int argc, char **argv) ambigsw (cp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + die("-%s unknown", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [switches] file", invo_name); @@ -345,7 +364,7 @@ main (int argc, char **argv) case LIBSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); /* create a minimal context */ if (context_foil (cp) == -1) done (1); @@ -353,21 +372,21 @@ main (int argc, char **argv) case ALIASW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); if ((state = alias (cp)) != AK_OK) - adios (NULL, "aliasing error in %s - %s", + die("aliasing error in %s - %s", cp, akerror (state)); continue; case CHKSW: - checksw++; + checksw = true; continue; case NCHKSW: - checksw = 0; + checksw = false; continue; case DEBUGSW: - debug++; + debug = true; continue; case DISTSW: @@ -376,18 +395,18 @@ main (int argc, char **argv) case FILTSW: if (!(filter = *argp++) || *filter == '-') - adios (NULL, "missing argument to %s", argp[-2]); - mime = 0; + die("missing argument to %s", argp[-2]); + mime = false; continue; case NFILTSW: filter = NULL; continue; case FRMTSW: - format++; + format = true; continue; case NFRMTSW: - format = 0; + format = false; continue; case BITSTUFFSW: @@ -398,86 +417,86 @@ main (int argc, char **argv) continue; case MIMESW: - mime++; + mime = true; filter = NULL; continue; case NMIMESW: - mime = 0; + mime = false; continue; case MSGDSW: - msgid++; + msgid = true; continue; case NMSGDSW: - msgid = 0; + msgid = false; continue; case VERBSW: - verbose++; + verbose = true; continue; case NVERBSW: - verbose = 0; + verbose = false; continue; case WATCSW: - watch++; + watch = true; continue; case NWATCSW: - watch = 0; + watch = false; continue; case WHOMSW: - whomsw++; + whomsw = true; continue; case WIDTHSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); if ((outputlinelen = atoi (cp)) < 10) - adios (NULL, "impossible width %d", outputlinelen); + die("impossible width %d", outputlinelen); continue; case ANNOSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); if ((pfd = atoi (cp)) <= 2) - adios (NULL, "bad argument %s %s", argp[-2], cp); + die("bad argument %s %s", argp[-2], cp); continue; case CLIESW: if (!(clientsw = *argp++) || *clientsw == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case SERVSW: if (!(serversw = *argp++) || *serversw == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case SNOOPSW: - snoop++; + snoop = true; continue; case PARTSW: if (!(partno = *argp++) || *partno == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case SASLSW: - sasl++; + sasl = true; continue; case NOSASLSW: - sasl = 0; + sasl = false; continue; case SASLMECHSW: if (!(saslmech = *argp++) || *saslmech == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case AUTHSERVICESW: if (!(auth_svc = *argp++) || *auth_svc == '-') - adios (NULL, "missing argument to %s", argp[-2]); - oauth_flag++; + die("missing argument to %s", argp[-2]); + oauth_flag = true; continue; case OAUTHCREDFILESW: @@ -491,7 +510,7 @@ main (int argc, char **argv) int i; if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); for (i = 0; oauthswitches[i].profname != NULL; i++) { if (oauthswitches[i].switchnum == swnum) { @@ -501,21 +520,21 @@ main (int argc, char **argv) } if (oauthswitches[i].profname == NULL) - adios (NULL, "internal error: cannot map switch %s " + die("internal error: cannot map switch %s " "to profile entry", argp[-2]); - oauth_flag++; + oauth_flag = true; continue; } case USERSW: if (!(user = *argp++) || *user == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case PORTSW: if (!(port = *argp++) || *port == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case TLSSW: @@ -530,65 +549,72 @@ main (int argc, char **argv) tls = 0; continue; + case CERTVERSW: + noverify = false; + continue; + + case NOCERTVERSW: + noverify = true; + continue; + case FILEPROCSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); fileproc = cp; continue; case MHLPROCSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); mhlproc = cp; continue; case MTSSM: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); sendmail = cp; continue; case MTSSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); save_mts_method (cp); continue; case CREDENTIALSSW: { if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); add_profile_entry ("credentials", cp); continue; } case MESSAGEIDSW: if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); if (save_message_id_style (cp) != 0) - adios (NULL, "unsupported messageid \"%s\"", cp); + die("unsupported messageid \"%s\"", cp); continue; } } if (msg) - adios (NULL, "only one message at a time!"); - else - msg = cp; + die("only one message at a time!"); + msg = cp; } alias (AliasFile); if (!msg) - adios (NULL, "usage: %s [switches] file", invo_name); + die("usage: %s [switches] file", invo_name); if (outputlinelen < 10) - adios (NULL, "impossible width %d", outputlinelen); + die("impossible width %d", outputlinelen); if ((in = fopen (msg, "r")) == NULL) adios (msg, "unable to open"); start_headers (); if (debug) { - verbose++; + verbose = true; out = stdout; } else { if (whomsw) { @@ -597,7 +623,7 @@ main (int argc, char **argv) } else { char *cp = m_mktemp2(NULL, invo_name, NULL, &out); if (cp == NULL) { - adios(NULL, "unable to create temporary file in %s", + die("unable to create temporary file in %s", get_temp_dir()); } strncpy(tmpfil, cp, sizeof(tmpfil)); @@ -606,16 +632,17 @@ main (int argc, char **argv) hdrtab = msgstate == NORMAL ? NHeaders : RHeaders; + gstate = m_getfld_state_init(in); for (compnum = 1;;) { int bufsz = sizeof buf; - switch (state = m_getfld (&gstate, name, buf, &bufsz, in)) { + switch (state = m_getfld2(&gstate, name, buf, &bufsz)) { case FLD: case FLDPLUS: compnum++; - cp = add (buf, NULL); + cp = mh_xstrdup(buf); while (state == FLDPLUS) { bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, in); + state = m_getfld2(&gstate, name, buf, &bufsz); cp = add (buf, cp); } putfmt (name, cp, &eai, out); @@ -629,7 +656,7 @@ main (int argc, char **argv) fprintf (out, "\n%s", buf); while (state == BODY) { bufsz = sizeof buf; - state = m_getfld (&gstate, name, buf, &bufsz, in); + state = m_getfld2(&gstate, name, buf, &bufsz); fputs (buf, out); } break; @@ -640,10 +667,10 @@ main (int argc, char **argv) case LENERR: case FMTERR: - adios (NULL, "message format error in component #%d", compnum); + die("message format error in component #%d", compnum); default: - adios (NULL, "getfld() returned %d", state); + die("getfld() returned %d", state); } break; } @@ -656,9 +683,8 @@ main (int argc, char **argv) if (debug) { pl (); done (0); - } else { - fclose (out); } + fclose (out); /* * Here's how we decide which address to use as the envelope-from @@ -692,6 +718,16 @@ main (int argc, char **argv) #endif /* ! TLS_SUPPORT */ } + if (tls == 1) + tlsflag = S_STARTTLS; + else if (tls == 2) + tlsflag = S_INITTLS; + else + tlsflag = 0; + + if (noverify) + tlsflag |= S_NOVERIFY; + /* * If we were given any oauth flags, store the appropriate profile * entries and make sure an authservice was given (we have to do this @@ -704,7 +740,7 @@ main (int argc, char **argv) char sbuf[128]; if (auth_svc == NULL) { - adios(NULL, "No authentication service given with -authservice"); + die("No authentication service given with -authservice"); } for (i = 0; oauthswitches[i].profname != NULL; i++) { @@ -750,7 +786,7 @@ main (int argc, char **argv) if (partno) printf ("Partial Message #%s Processed\n", partno); else - printf ("Message Processed\n"); + puts("Message Processed"); } done (0); @@ -765,9 +801,13 @@ main (int argc, char **argv) static void putfmt (char *name, char *str, int *eai, FILE *out) { - int count, grp, i, keep; + int count; + bool grp; + int i, keep; char *cp, *pp, *qp; char namep[BUFSIZ], error[BUFSIZ]; + char *savehdr = NULL; + unsigned int savehdrlen = 0; struct mailname *mp = NULL, *np = NULL; struct headers *hdr; @@ -775,8 +815,8 @@ putfmt (char *name, char *str, int *eai, FILE *out) str++; if (msgstate == NORMAL && uprf (name, "resent")) { - advise (NULL, "illegal header line -- %s:", name); - badmsg++; + inform("illegal header line -- %s:", name); + badmsg = true; return; } @@ -785,7 +825,7 @@ putfmt (char *name, char *str, int *eai, FILE *out) If it does, enable EAI support. */ if (contains8bit(str, NULL)) { if (verbose) { - printf ("EAI/SMTPUTF8 enabled\n"); + puts("EAI/SMTPUTF8 enabled"); } /* Enable SMTPUTF8. */ @@ -804,10 +844,9 @@ putfmt (char *name, char *str, int *eai, FILE *out) should never have reached this point. Warn about any that are non-empty. */ if (strcmp (str, "\n")) { - char *newline = strchr (str, '\n'); - if (newline) *newline = '\0'; + trim_suffix_c(str, '\n'); if (! whomsw) { - advise (NULL, "ignoring header line -- %s: %s", name, str); + inform("ignoring header line -- %s: %s", name, str); } } } @@ -820,14 +859,14 @@ putfmt (char *name, char *str, int *eai, FILE *out) return; } if (hdr->flags & HBAD) { - advise (NULL, "illegal header line -- %s:", name); - badmsg++; + inform("illegal header line -- %s:", name); + badmsg = true; return; } msgflags |= (hdr->set & ~(MVIS | MINV)); if (hdr->flags & HSUB) - subject = subject ? add (str, add ("\t", subject)) : getcpy (str); + subject = subject ? add (str, add ("\t", subject)) : mh_xstrdup(str); if (hdr->flags & HFCC) { if ((cp = strrchr(str, '\n'))) *cp = 0; @@ -852,6 +891,19 @@ putfmt (char *name, char *str, int *eai, FILE *out) return; } + /* + * If this is a From:/Resent-From: header, save the full thing for + * later in case we need it for use when constructing a Bcc draft message. + * Because we want to capture the results of alias expansion, save + * the output from putadr(). + */ + + if ((msgstate == RESENT) ? (hdr->set & MRFM) : (hdr->set & MFRM)) { + savehdr = fullfrom; + savehdr[0] = '\0'; + savehdrlen = sizeof(fullfrom); + } + tmpaddrs.m_next = NULL; for (count = 0; (cp = getname (str)); count++) { @@ -867,7 +919,7 @@ putfmt (char *name, char *str, int *eai, FILE *out) if (hdr->flags & HTRY) badadr++; else - badmsg++; + badmsg = true; } } @@ -880,20 +932,20 @@ putfmt (char *name, char *str, int *eai, FILE *out) */ if ((msgstate == RESENT) ? (hdr->set & MRSN) : (hdr->set & MSND)) { - advise (NULL, "%s: field requires one address", name); - badmsg++; + inform("%s: field requires one address", name); + badmsg = true; } #ifdef notdef - advise (NULL, "%s: field requires at least one address", name); - badmsg++; + inform("%s: field requires at least one address", name); + badmsg = true; #endif /* notdef */ } return; } if (count > 1 && (hdr->flags & HONE)) { - advise (NULL, "%s: field only permits one address", name); - badmsg++; + inform("%s: field only permits one address", name); + badmsg = true; return; } @@ -901,7 +953,7 @@ putfmt (char *name, char *str, int *eai, FILE *out) snprintf (namep, sizeof(namep), "%s%s", (hdr->flags & HMNG) ? "Original-" : "", name); - for (grp = 0, mp = tmpaddrs.m_next; mp; mp = np) + for (grp = false, mp = tmpaddrs.m_next; mp; mp = np) if (mp->m_nohost) { /* also used to test (hdr->flags & HTRY) */ /* The address doesn't include a host, so it might be an alias. */ pp = akvalue (mp->m_mbox); /* do mh alias substitution */ @@ -936,7 +988,7 @@ putfmt (char *name, char *str, int *eai, FILE *out) : (hdr->set & MSND)) { strncpy(sender, auxformat(mp, 0), sizeof(sender) - 1); sender[sizeof(sender) - 1] = '\0'; - seensender++; + seensender = true; } /* @@ -952,9 +1004,8 @@ putfmt (char *name, char *str, int *eai, FILE *out) mp->m_bcc++; if (np->m_ingrp) mp->m_ingrp = np->m_ingrp; - else - if (mp->m_gname) - putgrp (namep, mp->m_gname, out, hdr->flags); + else if (mp->m_gname) + putgrp (namep, mp->m_gname, out, hdr->flags); if (mp->m_ingrp) { if (sm_mts == MTS_SENDMAIL_PIPE) { /* Catch this before sendmail chokes with: @@ -964,14 +1015,14 @@ putfmt (char *name, char *str, int *eai, FILE *out) aliases and put them in Bcc:, but then they'd have the Blind-Carbon-Copy indication. */ - adios (NULL, - "blind lists not compatible with" + die( "blind lists not compatible with" " sendmail/pipe"); } - grp++; + grp = true; } - if (putadr (namep, qp, mp, out, hdr->flags)) + if (putadr (namep, qp, mp, out, hdr->flags, savehdr, + savehdrlen)) msgflags |= (hdr->set & (MVIS | MINV)); else mnfree (mp); @@ -1002,7 +1053,7 @@ putfmt (char *name, char *str, int *eai, FILE *out) : (hdr->set & MSND)) { strncpy(sender, auxformat(mp, 0), sizeof(sender) - 1); sender[sizeof(sender) - 1] = '\0'; - seensender++; + seensender = true; } /* @@ -1019,8 +1070,8 @@ putfmt (char *name, char *str, int *eai, FILE *out) if (mp->m_gname) putgrp (namep, mp->m_gname, out, hdr->flags); if (mp->m_ingrp) - grp++; - keep = putadr (namep, "", mp, out, hdr->flags); + grp = true; + keep = putadr (namep, "", mp, out, hdr->flags, savehdr, savehdrlen); np = mp->m_next; if (keep) { mp->m_next = NULL; @@ -1031,25 +1082,19 @@ putfmt (char *name, char *str, int *eai, FILE *out) } /* - * If this is a From:/Resent-From: header, save the full thing for - * later in case we need it for use when constructing a Bcc draft message + * If it was a From header, strip off any trailing newlines from + * the alias-expanded From line. */ if ((msgstate == RESENT) ? (hdr->set & MRFM) : (hdr->set & MFRM)) { - strncpy(fullfrom, str, sizeof(fullfrom)); - fullfrom[sizeof(fullfrom) - 1] = 0; - /* - * Strip off any trailing newlines - */ - - while (strlen(fullfrom) > 0 && fullfrom[strlen(fullfrom) - 1] == '\n') { + while (*fullfrom && fullfrom[strlen(fullfrom) - 1] == '\n') { fullfrom[strlen(fullfrom) - 1] = '\0'; } } - if (grp > 0 && (hdr->flags & HNGR)) { - advise (NULL, "%s: field does not allow groups", name); - badmsg++; + if (grp && (hdr->flags & HNGR)) { + inform("%s: field does not allow groups", name); + badmsg = true; } if (linepos) { putc ('\n', out); @@ -1088,16 +1133,16 @@ finish_headers (FILE *out) /* * A From: header is now required in the draft. */ - advise (NULL, "message has no From: header"); - advise (NULL, "See default components files for examples"); - badmsg++; + inform("message has no From: header"); + inform("See default components files for examples"); + badmsg = true; break; } - if (fromcount > 1 && (seensender == 0 && !(msgflags & MEFM))) { - advise (NULL, "A Sender: or Envelope-From: header is required " + if (fromcount > 1 && (!seensender && !(msgflags & MEFM))) { + inform("A Sender: or Envelope-From: header is required " "with multiple\nFrom: addresses"); - badmsg++; + badmsg = true; break; } @@ -1113,12 +1158,12 @@ finish_headers (FILE *out) * from Envelope-From: (which in this case, cannot be blank) */ - if (fromcount > 1 && seensender == 0) { + if (fromcount > 1 && !seensender) { if (efrom[0] == '\0') { - advise (NULL, "Envelope-From cannot be blank when there " + inform("Envelope-From cannot be blank when there " "is multiple From: addresses\nand no Sender: " "header"); - badmsg++; + badmsg = true; } else { fprintf (out, "Sender: %s\n", efrom); } @@ -1130,23 +1175,23 @@ finish_headers (FILE *out) case RESENT: if (!(msgflags & MDAT)) { - advise (NULL, "message has no Date: header"); - badmsg++; + inform("message has no Date: header"); + badmsg = true; } if (!(msgflags & MFRM)) { - advise (NULL, "message has no From: header"); - badmsg++; + inform("message has no From: header"); + badmsg = true; } if (!(msgflags & MRFM)) { - advise (NULL, "message has no Resent-From: header"); - advise (NULL, "See default components files for examples"); - badmsg++; + inform("message has no Resent-From: header"); + inform("See default components files for examples"); + badmsg = true; break; } - if (fromcount > 1 && (seensender == 0 && !(msgflags & MEFM))) { - advise (NULL, "A Resent-Sender: or Envelope-From: header is " + if (fromcount > 1 && (!seensender && !(msgflags & MEFM))) { + inform("A Resent-Sender: or Envelope-From: header is " "required with multiple\nResent-From: addresses"); - badmsg++; + badmsg = true; break; } @@ -1163,12 +1208,12 @@ finish_headers (FILE *out) * from Envelope-From (which in this case, cannot be blank) */ - if (fromcount > 1 && seensender == 0) { + if (fromcount > 1 && !seensender) { if (efrom[0] == '\0') { - advise (NULL, "Envelope-From cannot be blank when there " + inform("Envelope-From cannot be blank when there " "is multiple Resent-From: addresses and no " "Resent-Sender: header"); - badmsg++; + badmsg = true; } else { fprintf (out, "Resent-Sender: %s\n", efrom); } @@ -1180,9 +1225,9 @@ finish_headers (FILE *out) } if (badmsg) - adios (NULL, "re-format message and try again"); + die("re-format message and try again"); if (!recipients) - adios (NULL, "no addressees"); + die("no addressees"); } @@ -1191,18 +1236,22 @@ get_header (char *header, struct headers *table) { struct headers *h; + header = FENDNULL(header); for (h = table; h->value; h++) - if (!strcasecmp (header ? header : "", h->value ? h->value : "")) - return (h - table); + if (!strcasecmp(FENDNULL(h->value), header)) + return h - table; return NOTOK; } static int -putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flags) +putadr (char *name, char *aka, struct mailname *mp, FILE *out, + unsigned int flags, char *savehdr, unsigned int savehdrsize) { int len; + bool saveappend = false; + unsigned int shlen; char *cp; char buffer[BUFSIZ]; @@ -1217,8 +1266,13 @@ putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flag linepos += (nameoutput = strlen (name) + 2); } + if (savehdr) { + shlen = strlen(savehdr); + saveappend = true; + } + if (*aka && mp->m_type != UUCPHOST && !mp->m_pers) - mp->m_pers = getcpy (aka); + mp->m_pers = mh_xstrdup(aka); if (format) { if (mp->m_gname) { snprintf (buffer, sizeof(buffer), "%s;", mp->m_gname); @@ -1232,18 +1286,37 @@ putadr (char *name, char *aka, struct mailname *mp, FILE *out, unsigned int flag len = strlen (cp); if (linepos != nameoutput) { - if (len + linepos + 2 > outputlinelen) + if (len + linepos + 2 > outputlinelen) { fprintf (out, ",\n%*s", linepos = nameoutput, ""); - else { + if (saveappend) { + if (shlen + 2 + nameoutput + len >= savehdrsize) { + saveappend = false; + } else { + snprintf(savehdr + shlen, savehdrsize - shlen, ",\n%*s", + linepos, ""); + } + } + } else { fputs (", ", out); linepos += 2; + if (saveappend) { + if (shlen + 2 + len >= savehdrsize) { + saveappend = false; + } else { + strncat(savehdr, ", ", savehdrsize - shlen); + } + } } } fputs (cp, out); + + if (saveappend && shlen + len < savehdrsize) + strncat(savehdr, cp, savehdrsize - shlen + len); + linepos += len; - return (flags & HTRY); + return flags & HTRY; } @@ -1293,15 +1366,15 @@ insert (struct mailname *np) : &netaddrs; mp->m_next; mp = mp->m_next) - if (!strcasecmp (np->m_host ? np->m_host : "", - mp->m_next->m_host ? mp->m_next->m_host : "") && - !strcasecmp (np->m_mbox ? np->m_mbox : "", - mp->m_next->m_mbox ? mp->m_next->m_mbox : "") && + if (!strcasecmp (FENDNULL(np->m_host), + FENDNULL(mp->m_next->m_host)) && + !strcasecmp (FENDNULL(np->m_mbox), + FENDNULL(mp->m_next->m_mbox)) && np->m_bcc == mp->m_next->m_bcc) return 0; mp->m_next = np; - recipients++; + recipients = true; return 1; } @@ -1312,29 +1385,29 @@ pl (void) int i; struct mailname *mp; - printf ("-------\n\t-- Addresses --\nlocal:\t"); + fputs("-------\n\t-- Addresses --\nlocal:\t", stdout); for (mp = localaddrs.m_next; mp; mp = mp->m_next) printf ("%s%s%s", mp->m_mbox, mp->m_bcc ? "[BCC]" : "", mp->m_next ? ",\n\t" : ""); - printf ("\nnet:\t"); + fputs("\nnet:\t", stdout); for (mp = netaddrs.m_next; mp; mp = mp->m_next) - printf ("%s%s@%s%s%s", mp->m_path ? mp->m_path : "", + printf ("%s%s@%s%s%s", FENDNULL(mp->m_path), mp->m_mbox, mp->m_host, mp->m_bcc ? "[BCC]" : "", mp->m_next ? ",\n\t" : ""); - printf ("\nuucp:\t"); + fputs("\nuucp:\t", stdout); for (mp = uuaddrs.m_next; mp; mp = mp->m_next) printf ("%s!%s%s%s", mp->m_host, mp->m_mbox, mp->m_bcc ? "[BCC]" : "", mp->m_next ? ",\n\t" : ""); - printf ("\n\t-- Folder Copies --\nfcc:\t"); + fputs("\n\t-- Folder Copies --\nfcc:\t", stdout); for (i = 0; i < fccind; i++) printf ("%s%s", fccfold[i], i + 1 < fccind ? ",\n\t" : ""); - printf ("\n"); + putchar('\n'); } @@ -1370,7 +1443,7 @@ annoaux (struct mailname *mp) snprintf (buffer, sizeof(buffer), "%s\n", adrformat (mp)); i = strlen (buffer); - return (write (pfd, buffer, i) == i ? OK : NOTOK); + return write(pfd, buffer, i) == i ? OK : NOTOK; } @@ -1389,8 +1462,8 @@ insert_fcc (struct headers *hdr, char *pp) return; if (fccind >= FCCS) - adios (NULL, "too many %ss", hdr->value); - fccfold[fccind++] = getcpy (cp); + die("too many %ss", hdr->value); + fccfold[fccind++] = mh_xstrdup(cp); } /* @@ -1407,7 +1480,7 @@ make_bcc_file (int dashstuff) char *tfile = NULL, *program; if ((tfile = m_mktemp2(NULL, "bccs", NULL, &out)) == NULL) { - adios(NULL, "unable to create temporary file in %s", get_temp_dir()); + die("unable to create temporary file in %s", get_temp_dir()); } strncpy (bccfil, tfile, sizeof(bccfil)); @@ -1432,15 +1505,14 @@ make_bcc_file (int dashstuff) * prefix and check again. */ if ((cp = strchr(prefix, 'a')) == NULL) - adios (NULL, "lost prefix start"); + die("lost prefix start"); while (find_prefix () == NOTOK) { if (*cp < 'z') (*cp)++; - else - if (*++cp == 0) - adios (NULL, "can't find a unique delimiter string"); - else - (*cp)++; + else if (*++cp == 0) + die("can't find a unique delimiter string"); + else + (*cp)++; } fprintf (out, "%s: %s\n%s: multipart/digest; boundary=\"", @@ -1457,8 +1529,7 @@ make_bcc_file (int dashstuff) * of MIME encapsulation. */ if (filter != NULL) { - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); + child_id = fork(); switch (child_id) { case NOTOK: adios ("fork", "unable to"); @@ -1482,7 +1553,7 @@ make_bcc_file (int dashstuff) execvp (program, vec); fprintf (stderr, "unable to exec "); perror (mhlproc); - _exit (-1); + _exit(1); default: pidXwait (child_id, mhlproc); @@ -1528,7 +1599,7 @@ find_prefix (void) if ((in = fopen (tmpfil, "r")) == NULL) adios (tmpfil, "unable to re-open"); - while (fgets (buffer, sizeof(buffer) - 1, in)) + while (fgets (buffer, sizeof buffer, in)) if (buffer[0] == '-' && buffer[1] == '-') { char *cp; @@ -1547,18 +1618,16 @@ find_prefix (void) } -#define plural(x) (x == 1 ? "" : "s") - static void chkadr (void) { if (badadr && unkadr) - die (NULL, "%d address%s unparsable, %d addressee%s undeliverable", - badadr, plural (badadr), unkadr, plural (badadr)); + fatal (NULL, "%d address%s unparsable, %d addressee%s undeliverable", + badadr, PLURALS(badadr), unkadr, PLURALS(badadr)); if (badadr) - die (NULL, "%d address%s unparsable", badadr, plural (badadr)); + fatal (NULL, "%d address%s unparsable", badadr, PLURALS(badadr)); if (unkadr) - die (NULL, "%d addressee%s undeliverable", unkadr, plural (unkadr)); + fatal (NULL, "%d addressee%s undeliverable", unkadr, PLURALS(unkadr)); } @@ -1573,7 +1642,7 @@ do_addresses (int bccque, int talk) for (lp = localaddrs.m_next; lp; lp = lp->m_next) if (lp->m_bcc ? bccque : !bccque) { if (talk && !state) - printf (" -- Local Recipients --\n"); + puts(" -- Local Recipients --"); do_an_address (lp, talk); state++; } @@ -1582,7 +1651,7 @@ do_addresses (int bccque, int talk) for (lp = uuaddrs.m_next; lp; lp = lp->m_next) if (lp->m_bcc ? bccque : !bccque) { if (talk && !state) - printf (" -- UUCP Recipients --\n"); + puts(" -- UUCP Recipients --"); do_an_address (lp, talk); state++; } @@ -1591,7 +1660,7 @@ do_addresses (int bccque, int talk) for (lp = netaddrs.m_next; lp; lp = lp->m_next) if (lp->m_bcc ? bccque : !bccque) { if (talk && !state) - printf (" -- Network Recipients --\n"); + puts(" -- Network Recipients --"); do_an_address (lp, talk); state++; } @@ -1599,7 +1668,7 @@ do_addresses (int bccque, int talk) chkadr (); if (rp_isbad (retval = sm_waend ())) - die (NULL, "problem ending addresses; %s", rp_string (retval)); + fatal (NULL, "problem ending addresses; %s", rp_string (retval)); } @@ -1616,7 +1685,7 @@ static void post (char *file, int bccque, int talk, int eai, char *envelope, int oauth_flag, char *auth_svc) { - int retval, i; + int retval; pid_t child_id; if (verbose) { @@ -1624,7 +1693,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope, printf (" -- Posting for %s Recipients --\n", bccque ? "Blind" : "Sighted"); else - printf (" -- Posting for All Recipients --\n"); + puts(" -- Posting for All Recipients --"); } sigon (); @@ -1633,8 +1702,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope, char **argp, *program; int argc; - for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++) - sleep (5); + child_id = fork(); switch (child_id) { case NOTOK: adios ("fork", "unable to"); @@ -1665,7 +1733,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope, int eightbit = 0; if (fd == NOTOK) { - die (file, "unable to re-open"); + fatal (file, "unable to re-open"); } if (msgflags & MMIM && cte != UNKNOWN) { @@ -1675,16 +1743,16 @@ post (char *file, int bccque, int talk, int eai, char *envelope, } else { if (scan_input (fd, &eightbit) == NOTOK) { close (fd); - die (file, "problem reading from"); + fatal (file, "problem reading from"); } } if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch, verbose, snoop, sasl, saslmech, user, - oauth_flag ? auth_svc : NULL, tls)) + oauth_flag ? auth_svc : NULL, tlsflag)) || rp_isbad (retval = sm_winit (envelope, eai, eightbit))) { close (fd); - die (NULL, "problem initializing server; %s", rp_string (retval)); + fatal (NULL, "problem initializing server; %s", rp_string (retval)); } do_addresses (bccque, talk && verbose); @@ -1700,7 +1768,7 @@ post (char *file, int bccque, int talk, int eai, char *envelope, printf (" -- %s Recipient Copies Posted --\n", bccque ? "Blind" : "Sighted"); else - printf (" -- Recipient Copies Posted --\n"); + puts(" -- Recipient Copies Posted --"); } fflush (stdout); @@ -1725,35 +1793,35 @@ verify_all_addresses (int talk, int eai, char *envelope, int oauth_flag, if (rp_isbad (retval = sm_init (clientsw, serversw, port, watch, verbose, snoop, sasl, saslmech, user, - oauth_flag ? auth_svc : NULL, tls)) + oauth_flag ? auth_svc : NULL, tlsflag)) || rp_isbad (retval = sm_winit (envelope, eai, eightbit))) { - die (NULL, "problem initializing server; %s", rp_string (retval)); + fatal (NULL, "problem initializing server; %s", rp_string (retval)); } } if (talk && !whomsw) - printf (" -- Address Verification --\n"); + puts(" -- Address Verification --"); if (talk && localaddrs.m_next) - printf (" -- Local Recipients --\n"); + puts(" -- Local Recipients --"); for (lp = localaddrs.m_next; lp; lp = lp->m_next) do_an_address (lp, talk); if (talk && uuaddrs.m_next) - printf (" -- UUCP Recipients --\n"); + puts(" -- UUCP Recipients --"); for (lp = uuaddrs.m_next; lp; lp = lp->m_next) do_an_address (lp, talk); if (talk && netaddrs.m_next) - printf (" -- Network Recipients --\n"); + puts(" -- Network Recipients --"); for (lp = netaddrs.m_next; lp; lp = lp->m_next) do_an_address (lp, talk); chkadr (); if (talk && !whomsw) - printf (" -- Address Verification Successful --\n"); + puts(" -- Address Verification Successful --"); if (!whomsw || checksw) - sm_end (DONE); + sm_end (whomsw ? OK : DONE); fflush (stdout); sigoff (); @@ -1795,14 +1863,14 @@ do_an_address (struct mailname *lp, int talk) return; } if (talk) - printf (": "); + fputs(": ", stdout); fflush (stdout); switch (retval = sm_wadr (mbox, host, lp->m_type != UUCPHOST ? lp->m_path : NULL)) { case RP_OK: if (talk) - printf ("address ok\n"); + puts("address ok"); break; case RP_NO: @@ -1817,7 +1885,7 @@ do_an_address (struct mailname *lp, int talk) default: if (!talk) fprintf (stderr, " %s: ", addr); - die (NULL, "unexpected response; %s", rp_string (retval)); + fatal (NULL, "unexpected response; %s", rp_string (retval)); } fflush (stdout); @@ -1830,15 +1898,15 @@ do_text (char *file, int fd) int retval, state; char buf[BUFSIZ]; - lseek (fd, (off_t) 0, SEEK_SET); + lseek(fd, 0, SEEK_SET); while ((state = read (fd, buf, sizeof(buf))) > 0) { if (rp_isbad (retval = sm_wtxt (buf, state))) - die (NULL, "problem writing text; %s\n", rp_string (retval)); + fatal (NULL, "problem writing text; %s\n", rp_string (retval)); } if (state == NOTOK) - die (file, "problem reading from"); + fatal (file, "problem reading from"); switch (retval = sm_wtend ()) { case RP_OK: @@ -1846,10 +1914,11 @@ do_text (char *file, int fd) case RP_NO: case RP_NDEL: - die (NULL, "posting failed; %s", rp_string (retval)); + fatal (NULL, "posting failed; %s", rp_string (retval)); + break; default: - die (NULL, "unexpected response; %s", rp_string (retval)); + fatal (NULL, "unexpected response; %s", rp_string (retval)); } } @@ -1912,11 +1981,11 @@ p_refile (char *file) return; if (verbose) - printf (" -- Filing Folder Copies --\n"); + puts(" -- Filing Folder Copies --"); for (i = 0; i < fccind; i++) fcc (file, fccfold[i]); if (verbose) - printf (" -- Folder Copies Filed --\n"); + puts(" -- Folder Copies Filed --"); } @@ -1928,7 +1997,7 @@ static void fcc (char *file, char *folder) { pid_t child_id; - int i, status, argp; + int status, argp; char fold[BUFSIZ]; char **arglist, *program; @@ -1936,9 +2005,7 @@ fcc (char *file, char *folder) printf (" %sFcc %s: ", msgstate == RESENT ? "Resent-" : "", folder); fflush (stdout); - for (i = 0; (child_id = fork ()) == NOTOK && i < 5; i++) - sleep (5); - + child_id = fork(); switch (child_id) { case NOTOK: if (!verbose) @@ -1961,17 +2028,17 @@ fcc (char *file, char *folder) arglist[argp++] = fold; arglist[argp] = NULL; execvp (program, arglist); - _exit (-1); + _exit(1); default: if ((status = pidwait (child_id, OK))) { if (!verbose) fprintf (stderr, " %sFcc %s: ", msgstate == RESENT ? "Resent-" : "", folder); - pidstatus (status, verbose ? stdout : stderr, NULL); + pidstatus (status, verbose ? stdout : stderr, fileproc); } else { if (verbose) - printf ("folder ok\n"); + puts("folder ok"); } } @@ -1983,10 +2050,13 @@ fcc (char *file, char *folder) */ static void -die (char *what, char *fmt, ...) +fatal (char *what, char *fmt, ...) { + int err; va_list ap; + err = errno; + (void) m_unlink (tmpfil); if (msgflags & MINV) (void) m_unlink (bccfil); @@ -1995,6 +2065,7 @@ die (char *what, char *fmt, ...) sm_end (NOTOK); va_start(ap, fmt); + errno = err; advertise (what, NULL, fmt, ap); va_end(ap); done (1);