#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 }
};
};
-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 */
char *sargv[16], buf[BUFSIZ], name[NAMESZ];
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;
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)
tmpfil = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out));
}
+ /* check for "Aliasfile:" profile entry */
+ if ((cp = context_find("Aliasfile"))) {
+ char *dp, **ap;
+
+ aliasflg = 1;
+ for (ap=brkstring(dp=getcpy(cp), " ", "\n"); ap && *ap;
+ ap++) {
+ if ((state = alias(etcpath(*ap))) != AK_OK) {
+ adios(NULL, "aliasing error in file %s: %s",
+ *ap, akerror(state));
+ }
+ }
+ }
+
+
hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
for (compnum = 1, state = FLD;;) {
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)) {
}
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);
- }
+ argp = sargv;
+ *argp++ = "send-mail";
+ *argp++ = "-m"; /* send to me too */
+ *argp++ = "-t"; /* read msg for recipients */
+ *argp++ = "-i"; /* don't stop on "." */
+ if (verbose) {
+ *argp++ = "-v";
}
+ *argp = NULL;
execv(sendmail, sargv);
adios(sendmail, "can't exec");
return -1;
char *cp;
struct headers *hdr;
- /* 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 */
- fprintf(out, "%s: %s", name, str);
+ /* 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);
+ }
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;
}
fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
}
- strncpy(from, getusername(), sizeof(from));
+ snprintf(from, sizeof(from), "%s@%s", getusername(), LocalName());
if ((cp = getfullname()) && *cp) {
snprintf(signature, sizeof(signature), "%s <%s>", cp, from);
} else {
if (!(msgflags & MFRM)) {
fprintf(out, "%sFrom: %s\n", resentstr, signature);
} else {
- /* In case the From: header contains multiple addresses. */
+ /*
+ ** Add a Sender: header because the From: header could
+ ** be fake or contain multiple addresses.
+ */
fprintf(out, "%sSender: %s\n", resentstr, from);
}
if (!(msgflags & MVIS)) {
- fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr);
+ fprintf(out, "%sBcc: undisclosed-recipients:;\n", resentstr);
}
if (badmsg) {
unlink(tmpfil);
folders);
fflush(stdout);
}
- if (strlen(fileproc)+strlen(file)+strlen(folders)+100 > sizeof cmd) {
+ if (100+strlen(file)+strlen(folders) > sizeof cmd) {
adios(NULL, "Too much Fcc data");
}
/* hack: read from /dev/null and refile(1) won't question us */
- snprintf(cmd, sizeof cmd, "</dev/null %s -link -file %s %s",
- fileproc, file, folders);
+ snprintf(cmd, sizeof cmd, "</dev/null refile -link -file '%s' %s",
+ file, folders);
status = system(cmd);
if (status == -1) {
fprintf(stderr, "Skipped %sFcc %s: unable to system().\n",
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));
fprintf(out, "To: %s\n", mp->m_text);
fprintf(out, "Subject: [BCC] %s", subject ? subject : "");
fprintf(out, "------------\n");
fclose(out);
- snprintf(buf, sizeof buf, "send%s %s",
- pushflg ? " -push" : "", bccdraft);
+ snprintf(buf, sizeof buf, "send %s", bccdraft);
if (system(buf) != 0) {
admonish(invo_name, "Problems to send Bcc to %s",
mp->m_text);
unlink(bccdraft);
}
- /* TODO: unlink renamed bcc draft after send(1) */
}
}