{ "Resent-Date", HNOP, MRDT },
{ "Resent-Subject", HSUB, 0 },
{ "Resent-To", HADR|HTRY, MVIS },
- { "Resent-cc", HADR|HTRY, MVIS },
+ { "Resent-Cc", HADR|HTRY, MVIS },
{ "Resent-Bcc", HADR|HTRY|HBCC, MINV },
{ "Resent-Message-Id", HBAD, 0 },
{ "Resent-Fcc", HFCC, 0 },
static int watch = 0; /* watch the delivery process */
static int backflg = 0; /* rename input file as *.bak when done */
static int pushflg = 0; /* if going to fork to sendmail */
-static int aliasflg = -1; /* if going to process aliases */
+static int aliasflg = 0; /* if going to process aliases */
static int outputlinelen=72;
static unsigned msgflags = 0; /* what we've seen */
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* foil search of user profile/context */
if (context_foil(NULL) == -1)
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
- case AMBIGSW:
- ambigsw(cp, switches);
- done(1);
- case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ done(1);
+ case UNKWNSW:
+ adios(NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf),
+ "%s [switches] file",
+ invo_name);
+ print_help(buf, switches, 1);
+ done(1);
+ case VERSIONSW:
+ print_version(invo_name);
+ done(1);
+
+ case DEBUGSW:
+ debug++;
+ continue;
- case HELPSW:
- snprintf(buf, sizeof(buf), "%s [switches] file", invo_name);
- print_help(buf, switches, 1);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
+ case DISTSW:
+ msgstate = resent;
+ continue;
+
+ case FILTSW:
+ if (!(filter = *argp++) || *filter == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
+ case NFILTSW:
+ filter = NULL;
+ continue;
+
+ case REMVSW:
+ rmflg++;
+ continue;
+ case NREMVSW:
+ rmflg = 0;
+ continue;
+
+ case BACKSW:
+ backflg++;
+ continue;
+ case NBACKSW:
+ backflg = 0;
+ continue;
+
+ case VERBSW:
+ verbose++;
+ continue;
+ 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 WIDTHSW:
+ if (!(cp = *argp++) || *cp == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ outputlinelen = atoi(cp);
+ if (outputlinelen <= 10)
+ outputlinelen = 72;
+ 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;
- case DEBUGSW:
- debug++;
- continue;
-
- case DISTSW:
- msgstate = resent;
- continue;
-
- case FILTSW:
- if (!(filter = *argp++) ||
- *filter == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
- case NFILTSW:
- filter = NULL;
- continue;
-
- case REMVSW:
- rmflg++;
- continue;
- case NREMVSW:
- rmflg = 0;
- continue;
-
- case BACKSW:
- backflg++;
- continue;
- case NBACKSW:
- backflg = 0;
- continue;
-
- case VERBSW:
- verbose++;
- continue;
- 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]);
- if (aliasflg < 0) {
- /* load default aka's */
- alias(AliasFile);
- }
- 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 WIDTHSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- outputlinelen = atoi(cp);
- if (outputlinelen <= 10)
- outputlinelen = 72;
- 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;
-
- case ANNOSW:
- /* -idanno switch ignored */
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
+ case ANNOSW:
+ /* -idanno switch ignored */
+ if (!(cp = *argp++) || *cp == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
}
}
if (msg)
msg = cp;
}
- if (aliasflg < 0)
- alias(AliasFile); /* load default aka's */
-
if (!msg)
adios(NULL, "usage: %s [switches] file", invo_name);
for (compnum = 1, state = FLD;;) {
switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
- case FLD:
- compnum++;
- putfmt(name, buf, out);
- continue;
-
- case FLDPLUS:
- compnum++;
+ case FLD:
+ compnum++;
+ putfmt(name, buf, out);
+ continue;
+
+ case FLDPLUS:
+ compnum++;
+ cp = add(buf, cp);
+ while (state == FLDPLUS) {
+ state = m_getfld(state, name, buf,
+ sizeof(buf), in);
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);
- continue;
-
- case BODY:
- finish_headers(out);
- fprintf(out, "\n%s", buf);
- while (state == BODY) {
- state = m_getfld(state, name, buf,
- sizeof(buf), in);
- fputs(buf, out);
- }
- break;
+ }
+ putfmt(name, cp, out);
+ free(cp);
+ continue;
+
+ case BODY:
+ finish_headers(out);
+ fprintf(out, "\n%s", buf);
+ while (state == BODY) {
+ state = m_getfld(state, name, buf,
+ sizeof(buf), in);
+ fputs(buf, out);
+ }
+ break;
- case FILEEOF:
- finish_headers(out);
- break;
+ case FILEEOF:
+ finish_headers(out);
+ break;
- case LENERR:
- case FMTERR:
- adios(NULL, "message format error in component #%d", compnum);
+ case LENERR:
+ case FMTERR:
+ adios(NULL, "message format error in component #%d",
+ compnum);
- default:
- adios(NULL, "getfld() returned %d", state);
+ default:
+ adios(NULL, "getfld() returned %d", state);
}
break;
}
if (pushflg && !(watch || verbose)) {
/* fork to a child to run sendmail */
- for (i=0; (pid = vfork()) == NOTOK && i < 5; i++)
+ for (i=0; (pid = fork()) == NOTOK && i < 5; i++)
sleep(5);
switch (pid) {
- 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);
+ 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);
}
}
execv(sendmail, sargv);
finish_headers(FILE *out)
{
switch (msgstate) {
- case normal:
- if (!(msgflags & MDAT))
- fprintf(out, "Date: %s\n", dtimenow(0));
+ case normal:
+ if (!(msgflags & MDAT))
+ fprintf(out, "Date: %s\n", dtimenow(0));
- if (msgflags & MFRM) {
+ if (msgflags & MFRM) {
+ /*
+ ** There was already a From: in the draft.
+ ** Don't add one.
+ */
+ if (!draft_from_masquerading)
/*
- ** There was already a From: in the draft.
- ** Don't add one.
+ ** mts.conf didn't contain
+ ** "masquerade:[...]draft_from[...]"
+ ** so we'll reveal the user's
+ ** actual account@thismachine
+ ** address in a Sender: header
+ ** (and use it as the envelope
+ ** From: later).
*/
- if (!draft_from_masquerading)
- /*
- ** mts.conf didn't contain
- ** "masquerade:[...]draft_from[...]"
- ** so we'll reveal the user's
- ** actual account@thismachine
- ** address in a Sender: header
- ** (and use it as the envelope
- ** From: later).
- */
- fprintf(out, "Sender: %s\n", from);
- } else
- fprintf(out, "From: %s\n", signature);
+ fprintf(out, "Sender: %s\n", from);
+ } else
+ fprintf(out, "From: %s\n", signature);
#ifdef notdef
- if (!(msgflags & MVIS))
- fprintf(out, "Bcc: Blind Distribution List: ;\n");
+ if (!(msgflags & MVIS))
+ fprintf(out, "Bcc: Blind Distribution List: ;\n");
#endif /* notdef */
- break;
+ break;
- case resent:
- if (!(msgflags & MRDT))
- fprintf(out, "Resent-Date: %s\n", dtimenow(0));
- if (msgflags & MRFM) {
+ case resent:
+ if (!(msgflags & MRDT))
+ fprintf(out, "Resent-Date: %s\n", dtimenow(0));
+ if (msgflags & MRFM) {
+ /*
+ ** There was already a Resent-From: in draft.
+ ** Don't add one.
+ */
+ if (!draft_from_masquerading)
/*
- ** There was already a Resent-From: in draft.
- ** Don't add one.
+ ** mts.conf didn't contain
+ ** "masquerade:[...]draft_from[...]"
+ ** so we'll reveal the user's
+ ** actual account@thismachine
+ ** address in a Sender: header
+ ** (and use it as the envelope
+ ** From: later).
*/
- if (!draft_from_masquerading)
- /*
- ** mts.conf didn't contain
- ** "masquerade:[...]draft_from[...]"
- ** so we'll reveal the user's
- ** actual account@thismachine
- ** address in a Sender: header
- ** (and use it as the envelope
- ** From: later).
- */
- fprintf(out, "Resent-Sender: %s\n",
- from);
- } else
- /* Construct a Resent-From: header. */
- fprintf(out, "Resent-From: %s\n", signature);
+ fprintf(out, "Resent-Sender: %s\n",
+ from);
+ } else
+ /* Construct a Resent-From: header. */
+ fprintf(out, "Resent-From: %s\n", signature);
#ifdef notdef
- if (!(msgflags & MVIS))
- fprintf(out, "Resent-Bcc: Blind Re-Distribution List: ;\n");
+ if (!(msgflags & MVIS))
+ fprintf(out, "Resent-Bcc: Blind Re-Distribution List: ;\n");
#endif /* notdef */
- break;
+ break;
}
if (badmsg)
cpydgst(fd, fileno(out), tmpfil, bccfil);
close(fd);
} else {
- vec[0] = r1bindex(mhlproc, '/');
+ vec[0] = mhbasename(mhlproc);
- for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
sleep(5);
switch (child_id) {
- case NOTOK:
- adios("vfork", "unable to");
-
- case OK:
- dup2(fileno(out), 1);
-
- i = 1;
- vec[i++] = "-forward";
- vec[i++] = "-form";
- vec[i++] = filter;
- vec[i++] = tmpfil;
- vec[i] = NULL;
-
- execvp(mhlproc, vec);
- adios(mhlproc, "unable to exec");
-
- default:
- if (status = pidwait(child_id, OK))
- admonish(NULL, "%s lost (status=0%o)",
- vec[0], status);
- break;
+ case NOTOK:
+ adios("fork", "unable to");
+
+ case OK:
+ dup2(fileno(out), 1);
+
+ i = 1;
+ vec[i++] = "-forward";
+ vec[i++] = "-form";
+ vec[i++] = filter;
+ vec[i++] = tmpfil;
+ vec[i] = NULL;
+
+ execvp(mhlproc, vec);
+ adios(mhlproc, "unable to exec");
+
+ default:
+ if (status = pidwait(child_id, OK))
+ admonish(NULL, "%s lost (status=0%o)",
+ vec[0], status);
+ break;
}
}
folder);
fflush(stdout);
- for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
+ for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
sleep(5);
switch (child_id) {
- case NOTOK:
+ case NOTOK:
+ if (!verbose)
+ fprintf(stderr, " %sFcc %s: ", msgstate == resent ?
+ "Resent-" : "", folder);
+ fprintf(verbose ? stdout : stderr, "no forks, so not ok\n");
+ break;
+
+ case OK:
+ snprintf(fold, sizeof(fold), "%s%s",
+ *folder == '+' || *folder == '@' ? "" : "+", folder);
+ execlp(fileproc, mhbasename(fileproc),
+ "-link", "-file", file, fold, NULL);
+ _exit(-1);
+
+ default:
+ if ((status = pidwait(child_id, OK))) {
if (!verbose)
fprintf(stderr, " %sFcc %s: ",
msgstate == resent ?
"Resent-" : "", folder);
- fprintf(verbose ? stdout : stderr, "no forks, so not ok\n");
- break;
-
- case OK:
- snprintf(fold, sizeof(fold), "%s%s",
- *folder == '+' || *folder == '@' ? "" : "+", folder);
- execlp(fileproc, r1bindex(fileproc, '/'),
- "-link", "-file", file, fold, NULL);
- _exit(-1);
-
- default:
- if ((status = pidwait(child_id, OK))) {
- if (!verbose)
- fprintf(stderr, " %sFcc %s: ",
- msgstate == resent ?
- "Resent-" : "",
- folder);
- fprintf(verbose ? stdout : stderr,
- " errored (0%o)\n", status);
- }
+ fprintf(verbose ? stdout : stderr, " errored (0%o)\n",
+ status);
+ }
}
fflush(stdout);