#include <h/dropsbr.h>
#include <h/tws.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
+#include <errno.h>
#define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */
-struct swit switches[] = {
+static struct swit switches[] = {
#define VERBSW 0
{ "verbose", 0 },
#define NVERBSW 1
- { "noverbose", 0 },
-#define WATCSW 2
- { "watch", 0 },
-#define NWATCSW 3
- { "nowatch", 0 },
-#define ALIASW 4
- { "alias aliasfile", 0 },
-#define NALIASW 5
- { "noalias", 0 },
-#define VERSIONSW 6
- { "version", 0 },
-#define HELPSW 7
+ { "noverbose", 2 },
+#define VERSIONSW 2
+ { "Version", 0 },
+#define HELPSW 3
{ "help", 0 },
-#define DEBUGSW 8
+#define DEBUGSW 4
{ "debug", -5 },
-#define DISTSW 9
+#define DISTSW 5
{ "dist", -4 }, /* interface from dist */
-#define PUSHSW 10 /* fork to sendmail then exit */
- { "push", -4 },
-#define NPUSHSW 11 /* exec sendmail */
- { "nopush", -6 },
-#define LIBSW 12
- { "library directory", -7 },
{ NULL, 0 }
};
+char *version=VERSION;
/* flags for headers->flags */
#define HNOP 0x0000 /* just used to keep .set around */
#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: */
#define MVIS 0x0008 /* we've seen sighted addrs */
#define MINV 0x0010 /* we've seen blind addrs */
#define MRDT 0x0020 /* we've seen a Resent-Date: */
+#define MFMM 0x0040 /* The Mail is From a Alternative-Mailbox Addresse */
struct headers {
char *value;
{ "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 },
{ "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 },
};
-static int badmsg = 0; /* message has bad semantics */
-static int verbose = 0; /* spell it out */
-static int debug = 0; /* debugging post */
-static int watch = 0; /* watch the delivery process */
-static int pushflg = 0; /* if going to fork to sendmail */
+static int badmsg = 0;
+static int verbose = 0;
+static int debug = 0;
static int aliasflg = 0; /* if going to process aliases */
static unsigned msgflags = 0; /* what we've seen */
static char *tmpfil;
static char *subject = NULL; /* the subject field for BCC'ing */
+static struct mailname *from = NULL; /* the from field for BCC'ing */
static char fccs[BUFSIZ] = "";
struct mailname *bccs = NULL; /* list of the bcc recipients */
+struct mailname *recipients = NULL; /* list of the recipients */
+size_t recipientsc = 0;
+struct mailname *sender = NULL;
static struct headers *hdrtab; /* table for the message we're doing */
static FILE *out; /* output (temp) file */
static void process_fcc(char *);
static void fcc(char *, char *);
static void process_bccs(char *);
+static size_t do_aliasing(struct mailname *, struct mailname **);
int
main(int argc, char **argv)
{
- int state, compnum;
+ enum state state;
+ struct field f = {{0}};
+ int compnum;
char *cp, *msg = NULL, **argp, **arguments;
- char *sargv[16], buf[BUFSIZ], name[NAMESZ];
+ char **sargv, buf[BUFSIZ];
FILE *in;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
- /* foil search of user profile/context */
- if (context_foil(NULL) == -1)
- done(1);
+ context_read();
arguments = getarguments(invo_name, argc, argv, 0);
argp = arguments;
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf),
"%s [switches] file",
invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case DEBUGSW:
debug++;
case NVERBSW:
verbose = 0;
continue;
-
- case WATCSW:
- watch++;
- continue;
- case NWATCSW:
- watch = 0;
- continue;
-
- case PUSHSW:
- pushflg++;
- continue;
- case NPUSHSW:
- pushflg = 0;
- continue;
-
- case ALIASW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- aliasflg = 1;
- if ((state = alias(cp)) != AK_OK)
- adios(NULL, "aliasing error in file %s - %s", cp, akerror(state));
- continue;
- case NALIASW:
- aliasflg = 0;
- continue;
-
- case LIBSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- /* create a minimal context */
- if (context_foil(cp) == -1)
- done(1);
- continue;
}
}
- if (msg)
- adios(NULL, "only one message at a time!");
- else
+ if (msg) {
+ adios(EX_USAGE, NULL, "only one message at a time!");
+ } else {
msg = cp;
+ }
}
- if (!msg)
- adios(NULL, "usage: %s [switches] file", invo_name);
+ if (!msg) {
+ adios(EX_USAGE, NULL, "usage: %s [switches] file", invo_name);
+ }
- if ((in = fopen(msg, "r")) == NULL)
- adios(msg, "unable to open");
+ if ((in = fopen(msg, "r")) == NULL) {
+ adios(EX_IOERR, msg, "unable to open");
+ }
if (debug) {
verbose++;
out = stdout;
} else {
- tmpfil = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out));
+ tmpfil = mh_xstrdup(m_mktemp2("/tmp/", invo_name, NULL, &out));
}
- hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
+ /* check for "Aliasfile:" profile entry */
+ if ((cp = context_find("Aliasfile"))) {
+ char *dp, **ap;
- for (compnum = 1, state = FLD;;) {
- switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
- case FLD:
- compnum++;
- putfmt(name, buf, out);
- continue;
+ aliasflg = 1;
+ for (ap=brkstring(dp=mh_xstrdup(cp), " ", "\n"); ap && *ap;
+ ap++) {
+ if ((state = alias(etcpath(*ap))) != AK_OK) {
+ adios(EX_IOERR, NULL, "aliasing error in file %s: %s",
+ *ap, akerror(state));
+ }
+ }
+ }
- case FLDPLUS:
+
+ hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
+
+ for (compnum = 1, state = FLD2;;) {
+ switch (state = m_getfld2(state, &f, in)) {
+ case FLD2:
compnum++;
- cp = add(buf, cp);
- while (state == FLDPLUS) {
- state = m_getfld(state, name, buf,
- sizeof(buf), in);
- cp = add(buf, cp);
- }
- putfmt(name, cp, out);
- free(cp);
+ putfmt(f.name, f.value, out);
continue;
- case BODY:
+ case BODY2:
finish_headers(out);
- fprintf(out, "\n%s", buf);
- while (state == BODY) {
- state = m_getfld(state, name, buf,
- sizeof(buf), in);
- fputs(buf, out);
+ fprintf(out, "\n%s", f.value);
+ while ((state = m_getfld2(state, &f, in)) == BODY2) {
+ if (f.valuelen >= NAMESZ) {
+ adios(EX_DATAERR, NULL, "Body contains a to long line");
+ }
+ fputs(f.value, out);
}
break;
- case FILEEOF:
+ case FILEEOF2:
finish_headers(out);
break;
- case LENERR:
- case FMTERR:
- adios(NULL, "message format error in component #%d",
+ case LENERR2:
+ case FMTERR2:
+ case IOERR2:
+ adios(EX_DATAERR, NULL, "message format error in component #%d",
compnum);
default:
- adios(NULL, "getfld() returned %d", state);
+ adios(EX_SOFTWARE, NULL, "getfld() returned %d", state);
}
break;
}
fclose(in);
+ if (state != FILEEOF2) {
+ adios(EX_IOERR, "m_getfld2", "Error while reading body");
+ }
+
if (debug) {
+ struct mailname *i = recipients;
/* stop here */
- done(0);
+ puts("----EOM----");
+ while (i) {
+ fputs(i->m_mbox, stdout);
+ if (i->m_host) {
+ fputs("@", stdout);
+ fputs(i->m_host, stdout);
+ }
+ fputs("\n", stdout);
+ i = i->m_next;
+ mnfree(recipients);
+ recipients = i;
+ }
+ exit(EX_OK);
}
fclose(out);
fcc(tmpfil, fccs);
}
- argp = sargv;
- *argp++ = "send-mail";
- *argp++ = "-m"; /* send to me too */
- *argp++ = "-t"; /* read msg for recipients */
- *argp++ = "-i"; /* don't stop on "." */
- if (watch || verbose) {
- *argp++ = "-v";
- pushflg = 0;
- }
- *argp = NULL;
-
if (bccs) {
process_bccs(tmpfil);
if (!(msgflags & MVIS)) {
/* only Bcc rcpts: we're finished here */
unlink(tmpfil);
- exit(0);
+ exit(EX_OK);
}
}
** the msg temp file as std in.
*/
if (!freopen(tmpfil, "r", stdin)) {
- adios(tmpfil, "can't reopen for sendmail");
+ adios(EX_IOERR, tmpfil, "can't reopen for sendmail");
}
unlink(tmpfil);
- if (pushflg) {
- /* fork to a child to run sendmail */
- switch (fork()) {
- case NOTOK:
- fprintf(verbose ? stdout : stderr,
- "%s: can't fork to %s\n",
- invo_name, sendmail);
- exit(-1);
- case OK:
- /* we're the child .. */
- break;
- default:
- exit(0);
+ if (recipientsc == 0) {
+ adios(EX_DATAERR, NULL, "message has no recipients");
+ }
+
+ sargv = mh_xcalloc(recipientsc + 4, sizeof(char **));
+
+ argp = sargv;
+ *argp++ = "send-mail";
+ *argp++ = "-i"; /* don't stop on "." */
+ if (verbose) {
+ *argp++ = "-v";
+ }
+
+ while (recipients != NULL) {
+ cp = mh_xstrdup(recipients->m_mbox);
+ if (recipients->m_host) {
+ cp = add("@", cp);
+ cp = add(recipients->m_host, cp);
}
+ *argp++ = cp;
+ cp = NULL;
+ recipients = recipients->m_next;
}
- execv(sendmail, sargv);
- adios(sendmail, "can't exec");
+ *argp = NULL;
+ execvp(sendmail, sargv);
+
+ if (errno == E2BIG) {
+ adios(EX_DATAERR, sendmail, "too much arguments, probably to much recipients");
+ }
+
+ adios(EX_OSERR, sendmail, "can't exec");
return -1;
}
putfmt(char *name, char *str, FILE *out)
{
int i;
- char *cp;
struct headers *hdr;
+ struct mailname addr_start, *addr_end;
+ size_t addrc = 0;
+ ssize_t ret;
+
+ addr_end = &addr_start;
+ addr_end->m_next = NULL;
- /* remove all leading whitespace (even newlines) */
- while (*str==' ' || *str=='\t' || *str=='\n') {
+ /* remove leading whitespace */
+ while (*str==' ' || *str=='\t') {
str++;
}
if ((i = get_header(name, hdrtab)) == NOTOK) {
- /* no header we would care for: push it through */
+ /* no header we would care for */
+ 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 */
hdr = &hdrtab[i];
- if (hdr->flags & HIGN || !*str) {
+ if (hdr->flags & HIGN || strcmp(str, "\n")==0) {
return;
}
return;
}
- if (hdr->flags & HBCC) {
- struct mailname *mp = NULL;
+ if (hdr->flags & HSUB) {
+ subject = mh_xstrdup(str);
+ }
- /* Create list of Bcc addrs. */
- while ((cp = getname(str))) {
- mp = getm(cp, NULL, 0, AD_HOST, NULL);
- mp->m_next = bccs; /* push */
- bccs = mp;
- }
+ if (!(hdr->flags & HADR)) {
+ fprintf(out, "%s: %s", name, str);
return;
}
- if (aliasflg && hdr->flags & HTRY) {
- /*
- ** This header contains address(es) that we have to do
- ** alias expansion on. Because of the saved state in
- ** getname we have to put all the addresses into a list.
- **/
- struct mailname *f = NULL;
+ if ((ret = getmboxes(str, &addr_end)) < 0) {
+ adios(EX_DATAERR, NULL, "can't parse address: %s", str);
+ }
+
+ addrc += ret;
+
+ if (aliasflg) {
+ addrc += do_aliasing(&addr_start, &addr_end);
+ }
+
+ if (hdr->flags & HBCC) {
+ addr_end->m_next = bccs;
+ bccs = addr_start.m_next;
+ return;
+ }
+
+ if (hdr->set & MFRM) {
struct mailname *mp = NULL;
+ struct mailname *my = NULL;
- while ((cp = getname(str))) {
- mp = getm(cp, NULL, 0, AD_HOST, NULL);
- if (!f) {
- f = mp;
- mp->m_next = mp;
- } else {
- mp->m_next = f->m_next;
- f->m_next = mp;
- f = mp;
+ /* needed because the address parser holds global state */
+ ismymbox(NULL);
+
+ for (mp = addr_start.m_next; mp; mp = mp->m_next) {
+ if (ismymbox(mp)) {
+ msgflags |= MFMM;
+ if (my == NULL) {
+ from = my = mp;
+ }
}
}
- f = mp->m_next;
- mp->m_next = NULL;
- /* Now munch on the list, possibly expanding aliases */
- putadr(name, f);
- return;
+
+ if (addrc > 1) {
+ sender = my;
+ }
}
- /*
- ** The author(s) of spost decided that alias substitution wasn't
- ** necessary for the non-HTRY headers. Unfortunately, one of
- ** those headers is "From:", and having alias substitution work on
- ** that is extremely useful for someone with a lot of POP3 email
- ** accounts or aliases. post supports aliasing of "From:"...
- **
- ** Since "From:"-processing is incompletely implemented in this
- ** unsupported and undocumented spost backend, I'm not going
- ** to take the time to implement my new draft-From:-based email
- ** address masquerading. If I do ever implement it here, I'd almost
- ** certainly want to implement "From:" line alias processing as well.
- ** -- Dan Harkless <dan-nmh@dilvish.speed.net>
- */
- /*
- ** Although there is no masquerading anymore in mmh, we might want
- ** to have aliasing of From: addresses. Think about it.
- ** -- meillo@marmaro.de 2012-02
- */
+ if (!(hdr->flags & HDCC)) {
+ putadr(name, addr_start.m_next);
+ }
- if (hdr->flags & HSUB) {
- subject = getcpy(str);
+ if (hdr->flags & HTRY) {
+ addr_end->m_next = recipients;
+ recipients = addr_start.m_next;
+ recipientsc += i;
}
- fprintf(out, "%s: %s", name, str);
}
fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
}
- strncpy(from, getusername(), sizeof(from));
- if ((cp = getfullname()) && *cp) {
- snprintf(signature, sizeof(signature), "%s <%s>", cp, from);
+ if (sender != NULL) {
+ snprintf(signature, sizeof(signature), "%s", sender->m_text);
+ } else if ((cp = context_find("Default-From")) != NULL) {
+ snprintf(signature, sizeof(signature), "%s", cp);
} else {
- snprintf(signature, sizeof(signature), "%s", from);
+ snprintf(from, sizeof(from), "%s@%s", getusername(), LocalName());
+ if ((cp = getfullname()) && *cp) {
+ snprintf(signature, sizeof(signature), "%s <%s>", cp, from);
+ } else {
+ snprintf(signature, sizeof(signature), "%s", from);
+ }
}
if (!(msgflags & MFRM)) {
fprintf(out, "%sFrom: %s\n", resentstr, signature);
} else {
- /* In case the From: header contains multiple addresses. */
- fprintf(out, "%sSender: %s\n", resentstr, from);
+ /*
+ ** Add a Sender: header because the From: header could
+ ** be fake or contain multiple addresses.
+ */
+ if (!(msgflags & MFMM) || sender != NULL) {
+ fprintf(out, "%sSender: %s\n", resentstr, signature);
+ }
}
if (!(msgflags & MVIS)) {
- fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr);
+ fprintf(out, "%sBcc: undisclosed-recipients:;\n", resentstr);
}
if (badmsg) {
unlink(tmpfil);
- adios(NULL, "re-format message and try again");
+ adios(EX_DATAERR, NULL, "re-format message and try again");
}
}
return (h - table);
}
}
-
return NOTOK;
}
static void
putadr(char *name, struct mailname *nl)
{
- struct mailname *mp, *mp2;
- int linepos;
+ struct mailname *mp;
char *cp;
+ int linepos;
int namelen;
fprintf(out, "%s: ", name);
fprintf(out, "\n%s: ", name);
linepos = namelen;
}
- if (mp->m_nohost) {
- /* 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 */
- linepos = putone(mp->m_text, linepos, namelen);
- } else {
- /* an alias - expand it */
- while ((cp = getname(cp))) {
- if (linepos > MAX_SM_FIELD) {
- fprintf(out, "\n%s: ", name);
- linepos = namelen;
- }
- mp2 = getm(cp, NULL, 0, AD_HOST, NULL);
- if (akvisible()) {
- mp2->m_pers = getcpy(mp->m_mbox);
- linepos = putone(adrformat(mp2), linepos, namelen);
- } else {
- linepos = putone(mp2->m_text,
- linepos,
- namelen);
- }
- mnfree(mp2);
- }
+ if (mp->m_ingrp) {
+ if (mp->m_gname != NULL) {
+ cp = mh_xstrdup(mp->m_gname);
+ cp = add(";", cp);
+ linepos = putone(cp, linepos, namelen);
+ mh_free0(&cp);
+ cp = NULL;
}
} else {
- /* not a local name - use what the user typed */
linepos = putone(mp->m_text, linepos, namelen);
}
- mp2 = mp;
mp = mp->m_next;
- mnfree(mp2);
}
putc('\n', out);
}
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;
int state = 0;
if (strlen(str)+strlen(fccs) > sizeof fccs /2) {
- adios(NULL, "Too much Fcc data");
+ adios(EX_DATAERR, NULL, "Too much Fcc data");
}
/* todo: better have three states: SEPARATOR, PLUS, WORD */
for (cp=pp=str; *cp; cp++) {
fflush(stdout);
}
if (100+strlen(file)+strlen(folders) > sizeof cmd) {
- adios(NULL, "Too much Fcc data");
+ adios(EX_DATAERR, NULL, "Too much Fcc data");
}
/* hack: read from /dev/null and refile(1) won't question us */
snprintf(cmd, sizeof cmd, "</dev/null refile -link -file '%s' %s",
fprintf(stderr, "Skipped %sFcc %s: unable to system().\n",
msgstate == resent ? "Resent-" : "", folders);
} else if (status != 0) {
- fprintf(stderr, "%sFcc %s: Problems occured.\n",
+ fprintf(stderr, "%sFcc %s: Problems occurred.\n",
msgstate == resent ? "Resent-" : "", folders);
}
}
process_bccs(char *origmsg)
{
char *bccdraft = NULL;
- char buf[BUFSIZ];
struct mailname *mp = NULL;
FILE *out = NULL;
for (mp=bccs; mp; mp=mp->m_next) {
- /*
- ** Note: This draft file will be left existing by send(1),
- ** although renamed with backup prefix.
- ** TODO: We should have it removed eventually.
- */
- bccdraft = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out));
+ bccdraft = mh_xstrdup(m_mktemp2("/tmp/", invo_name, NULL, &out));
fprintf(out, "To: %s\n", mp->m_text);
+ if (from) {
+ fprintf(out, "From: %s\n", from->m_text);
+ }
fprintf(out, "Subject: [BCC] %s", subject ? subject : "");
fprintf(out, "%s: %s\n", attach_hdr, origmsg);
fprintf(out, "------------\n");
fclose(out);
- snprintf(buf, sizeof buf, "send%s %s",
- pushflg ? " -push" : "", bccdraft);
- if (system(buf) != 0) {
+ if (execprogl("send", "send", bccdraft, (char *)NULL) != 0) {
admonish(invo_name, "Problems to send Bcc to %s",
mp->m_text);
unlink(bccdraft);
}
- /* TODO: unlink renamed bcc draft after send(1) */
}
}
+
+/*
+ * Do aliasing on a mailname linked list
+ * Begin at start->m_next
+ * End if m_next == NULL
+ * **end is set to the new end.
+ * Return the number of new mainames in the list
+ */
+
+static size_t
+do_aliasing(struct mailname *start, struct mailname **end)
+{
+ struct mailname *prev, *cur;
+ char *cp;
+ size_t i = 0;
+ ssize_t e;
+
+ prev = start;
+ cur = prev->m_next;
+
+ while (cur != NULL) {
+ if (cur->m_nohost) {
+ cp = akvalue(cur->m_mbox);
+ if (strcmp(cp, cur->m_mbox) != 0) {
+ prev->m_next = cur->m_next;
+ if ((e = getmboxes(cp, &prev)) < 0) {
+ goto error;
+ }
+ i += e;
+ i -= 1;
+ mnfree(cur);
+ } else {
+ prev = cur;
+ }
+ } else {
+ prev = cur;
+ }
+ cur = prev->m_next;
+ }
+ *end = prev;
+ return i;
+error:
+ adios(EX_CONFIG, NULL, "can't parse alias %s: %s", cur->m_mbox, cp);
+ return 0; /* not reached */
+}
projects / mmh / blobdiff