#include <h/aliasbr.h>
#include <h/dropsbr.h>
#include <h/tws.h>
-#include <h/mts.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
#define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */
-#define FCCS 10 /* max number of fccs allowed */
-
-struct swit switches[] = {
-#define FILTSW 0
- { "filter filterfile", 0 },
-#define NFILTSW 1
- { "nofilter", 0 },
-#define FRMTSW 2
- { "format", 0 },
-#define NFRMTSW 3
- { "noformat", 0 },
-#define REMVSW 4
- { "remove", 0 },
-#define NREMVSW 5
- { "noremove", 0 },
-#define VERBSW 6
+
+static struct swit switches[] = {
+#define VERBSW 0
{ "verbose", 0 },
-#define NVERBSW 7
- { "noverbose", 0 },
-#define WATCSW 8
- { "watch", 0 },
-#define NWATCSW 9
- { "nowatch", 0 },
-#define BACKSW 10
- { "backup", 0 },
-#define NBACKSW 11
- { "nobackup", 0 },
-#define ALIASW 12
- { "alias aliasfile", 0 },
-#define NALIASW 13
- { "noalias", 0 },
-#define WIDTHSW 14
- { "width columns", 0 },
-#define VERSIONSW 15
- { "version", 0 },
-#define HELPSW 16
+#define NVERBSW 1
+ { "noverbose", 2 },
+#define VERSIONSW 2
+ { "Version", 0 },
+#define HELPSW 3
{ "help", 0 },
-#define DEBUGSW 17
+#define DEBUGSW 4
{ "debug", -5 },
-#define DISTSW 18
+#define DISTSW 5
{ "dist", -4 }, /* interface from dist */
-#define PUSHSW 19 /* fork to sendmail then exit */
- { "push", -4 },
-#define NPUSHSW 20 /* exec sendmail */
- { "nopush", -6 },
-#define LIBSW 21
- { "library directory", -7 },
-#define ANNOSW 22
- { "idanno number", -6 },
{ NULL, 0 }
};
#define HSUB 0x0004 /* Subject: header */
#define HTRY 0x0008 /* try to send to addrs on header */
#define HBCC 0x0010 /* don't output this header */
-#define HMNG 0x0020 /* mung this header */
-#define HNGR 0x0040 /* no groups allowed in this header */
-#define HFCC 0x0080 /* FCC: type header */
-#define HNIL 0x0100 /* okay for this header not to have addrs */
-#define HIGN 0x0200 /* ignore this header */
+#define HFCC 0x0020 /* FCC: type header */
+#define HIGN 0x0040 /* ignore this 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;
unsigned int set;
};
-
static struct headers NHeaders[] = {
{ "Return-Path", HBAD, 0 },
{ "Received", HBAD, 0 },
- { "Reply-To", HADR|HNGR, 0 },
- { "From", HADR|HNGR, MFRM },
+ { "Reply-To", HADR, 0 },
+ { "From", HADR, MFRM },
{ "Sender", HADR|HBAD, 0 },
{ "Date", HNOP, MDAT },
{ "Subject", HSUB, 0 },
{ "To", HADR|HTRY, MVIS },
- { "cc", HADR|HTRY, MVIS },
- { "Bcc", HADR|HTRY|HBCC|HNIL, MINV },
+ { "Cc", HADR|HTRY, MVIS },
+ { "Bcc", HADR|HTRY|HBCC, MINV },
{ "Message-Id", HBAD, 0 },
{ "Fcc", HFCC, 0 },
+ { "Envelope-From", HIGN, 0 },
{ NULL, 0, 0 }
};
static struct headers RHeaders[] = {
- { "Resent-Reply-To", HADR|HNGR, 0 },
- { "Resent-From", HADR|HNGR, MRFM },
+ { "Resent-Reply-To", HADR, 0 },
+ { "Resent-From", HADR, MRFM },
{ "Resent-Sender", HADR|HBAD, 0 },
{ "Resent-Date", HNOP, MRDT },
{ "Resent-Subject", HSUB, 0 },
{ "Resent-Fcc", HFCC, 0 },
{ "Reply-To", HADR, 0 },
{ "Fcc", HIGN, 0 },
+ { "Envelope-From", HIGN, 0 },
{ NULL, 0, 0 }
};
-static short fccind = 0; /* index into fccfold[] */
-
-static int badmsg = 0; /* message has bad semantics */
-static int verbose = 0; /* spell it out */
-static int debug = 0; /* debugging post */
-static int rmflg = 1; /* remove temporary file when done */
-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 badmsg = 0;
+static int verbose = 0;
+static int debug = 0;
static int aliasflg = 0; /* if going to process aliases */
-static int outputlinelen=72;
static unsigned msgflags = 0; /* what we've seen */
normal, resent
} msgstate = normal;
-static char tmpfil[] = "/tmp/pstXXXXXX";
+static char *tmpfil;
-static char from[BUFSIZ]; /* my network address */
-static char signature[BUFSIZ]; /* my signature */
-static char *filter = NULL; /* the filter for BCC'ing */
static char *subject = NULL; /* the subject field for BCC'ing */
-static char *fccfold[FCCS]; /* foldernames for FCC'ing */
+static char fccs[BUFSIZ] = "";
+struct mailname *bccs = NULL; /* list of the bcc recipients */
static struct headers *hdrtab; /* table for the message we're doing */
static FILE *out; /* output (temp) file */
-extern char *sendmail;
-
-/*
-** external prototypes
-*/
-extern char *getfullname(void);
-extern char *getusername(void);
-
-extern boolean draft_from_masquerading; /* defined in mts.c */
-
/*
** static prototypes
*/
static void putfmt(char *, char *, FILE *);
-static void start_headers(void);
static void finish_headers(FILE *);
static int get_header(char *, struct headers *);
static void putadr(char *, struct mailname *);
static int putone(char *, int, int);
-static void insert_fcc(struct headers *, unsigned char *);
-static void file(char *);
+static void process_fcc(char *);
static void fcc(char *, char *);
-
-#if 0
-static void die(char *, char *, ...);
-static void make_bcc_file(void);
-#endif
+static void process_bccs(char *);
int
main(int argc, char **argv)
{
- int state, i, pid, compnum;
+ int state, compnum;
char *cp, *msg = NULL, **argp, **arguments;
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();
- mts_init(invo_name);
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++;
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 ANNOSW:
- /* -idanno switch ignored */
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- continue;
}
}
if (msg)
- adios(NULL, "only one message at a time!");
+ adios(EX_USAGE, NULL, "only one message at a time!");
else
msg = cp;
}
if (!msg)
- adios(NULL, "usage: %s [switches] file", invo_name);
+ adios(EX_USAGE, NULL, "usage: %s [switches] file", invo_name);
if ((in = fopen(msg, "r")) == NULL)
- adios(msg, "unable to open");
+ adios(EX_IOERR, msg, "unable to open");
- start_headers();
if (debug) {
verbose++;
out = stdout;
+ } else {
+ tmpfil = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out));
}
- else {
-#ifdef HAVE_MKSTEMP
- 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);
-#endif
+
+ /* 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(EX_IOERR, NULL, "aliasing error in file %s: %s",
+ *ap, akerror(state));
+ }
}
+ }
+
hdrtab = (msgstate == normal) ? NHeaders : RHeaders;
case LENERR:
case FMTERR:
- adios(NULL, "message format error in component #%d",
+ 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 (backflg) {
- strncpy(buf, m_backup(msg), sizeof(buf));
- if (rename(msg, buf) == NOTOK)
- advise(buf, "unable to rename %s to", msg);
- }
if (debug) {
- done(0);
+ /* stop here */
+ exit(EX_OK);
+ }
+
+ fclose(out);
+
+ /* process Fcc */
+ if (*fccs) {
+ fcc(tmpfil, fccs);
}
- else
- fclose(out);
- file(tmpfil);
+ if (bccs) {
+ process_bccs(tmpfil);
+ if (!(msgflags & MVIS)) {
+ /* only Bcc rcpts: we're finished here */
+ unlink(tmpfil);
+ exit(EX_OK);
+ }
+ }
/*
** re-open the temp file, unlink it and exec sendmail, giving it
** the msg temp file as std in.
*/
- if (freopen(tmpfil, "r", stdin) == NULL)
- adios(tmpfil, "can't reopen for sendmail");
- if (rmflg)
- unlink(tmpfil);
+ if (!freopen(tmpfil, "r", stdin)) {
+ adios(EX_IOERR, tmpfil, "can't reopen for sendmail");
+ }
+ unlink(tmpfil);
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)
+ if (verbose) {
*argp++ = "-v";
- *argp = NULL;
-
- if (pushflg && !(watch || verbose)) {
- /* fork to a child to run sendmail */
- 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);
- }
}
+ *argp = NULL;
execv(sendmail, sargv);
- adios(sendmail, "can't exec");
- return 0; /* dead code to satisfy the compiler */
+ adios(EX_OSERR, sendmail, "can't exec");
+ return -1;
}
+
/* DRAFT GENERATION */
static void
putfmt(char *name, char *str, FILE *out)
{
int i;
- char *cp, *pp;
+ char *cp;
struct headers *hdr;
- while (*str == ' ' || *str == '\t')
+ /* remove leading whitespace */
+ while (*str==' ' || *str=='\t') {
str++;
+ }
if ((i = get_header(name, hdrtab)) == NOTOK) {
- 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)
+
+ if (hdr->flags & HIGN || strcmp(str, "\n")==0) {
return;
+ }
+
if (hdr->flags & HBAD) {
advise(NULL, "illegal header line -- %s:", name);
badmsg++;
return;
}
- msgflags |= hdr->set;
- if (hdr->flags & HSUB)
- subject = subject ? add(str, add("\t", subject)) :
- getcpy(str);
+ msgflags |= hdr->set;
if (hdr->flags & HFCC) {
- if ((cp = strrchr(str, '\n')))
- *cp = 0;
- for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) {
- *cp++ = 0;
- insert_fcc(hdr, pp);
- }
- insert_fcc(hdr, pp);
+ process_fcc(str);
return;
}
-#ifdef notdef
if (hdr->flags & HBCC) {
- insert_bcc(str);
+ struct mailname *mp = NULL;
+
+ /* Create list of Bcc addrs. */
+ while ((cp = getname(str))) {
+ mp = getm(cp, NULL, 0, AD_HOST, NULL);
+ mp->m_next = bccs; /* push */
+ bccs = mp;
+ }
return;
}
-#endif /* notdef */
-
- if (*str != '\n' && *str != '\0') {
- 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. We then let putadr munch on that list,
- ** possibly expanding aliases.
- **/
- register struct mailname *f = 0;
- register struct mailname *mp = 0;
-
- while ((cp = getname(str))) {
- mp = getm( cp, NULL, 0, AD_HOST, NULL);
- if (f == 0) {
- f = mp;
- mp->m_next = mp;
- } else {
- mp->m_next = f->m_next;
- f->m_next = mp;
- f = mp;
- }
+
+ 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;
+ struct mailname *mp = 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;
}
- f = mp->m_next; mp->m_next = 0;
- putadr( name, f );
- } else {
- /*
- ** 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>
- */
- fprintf(out, "%s: %s", name, str );
}
+ f = mp->m_next;
+ mp->m_next = NULL;
+ /* Now munch on the list, possibly expanding aliases */
+ putadr(name, f);
+ return;
}
-}
+ /*
+ ** 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
+ */
-static void
-start_headers(void)
-{
- char *cp;
- char sigbuf[BUFSIZ];
+ if (hdr->set & MFRM) {
+
+ struct mailname *mp = NULL;
- strncpy(from, getusername(), sizeof(from));
+ /* This is need because the addresse parser hold global state */
+ ismymbox(NULL);
- if ((cp = getfullname()) && *cp) {
- strncpy(sigbuf, cp, sizeof(sigbuf));
- snprintf(signature, sizeof(signature), "%s <%s>",
- sigbuf, from);
- } else
- snprintf(signature, sizeof(signature), "%s", from);
+ while ((cp = getname(str)) != NULL) {
+ mp = getm(cp, NULL, 0, AD_NAME, NULL);
+ if (ismymbox(mp)) {
+ msgflags |= MFMM;
+ }
+ }
+ }
+
+ if (hdr->flags & HSUB) {
+ subject = getcpy(str);
+ }
+ fprintf(out, "%s: %s", name, str);
}
+/*
+** Add yet missing headers.
+*/
static void
finish_headers(FILE *out)
{
- switch (msgstate) {
- case normal:
- if (!(msgflags & MDAT))
- 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)
- /*
- ** 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);
-
-#ifdef notdef
- if (!(msgflags & MVIS))
- fprintf(out, "Bcc: Blind Distribution List: ;\n");
-#endif /* notdef */
- break;
+ char *cp;
+ char from[BUFSIZ]; /* my network address */
+ char signature[BUFSIZ]; /* my signature */
+ char *resentstr = (msgstate == resent) ? "Resent-" : "";
- 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)
- /*
- ** 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);
-#ifdef notdef
- if (!(msgflags & MVIS))
- fprintf(out, "Resent-Bcc: Blind Re-Distribution List: ;\n");
-#endif /* notdef */
- break;
+ if (!(msgflags & MDAT)) {
+ fprintf(out, "%sDate: %s\n", resentstr, dtimenow());
}
- if (badmsg)
- adios(NULL, "re-format message and try again");
+ if ((cp = context_find("Default-From")) != NULL) {
+ snprintf(signature, sizeof(signature), "%s", cp);
+ } else {
+ 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 {
+ /*
+ ** Add a Sender: header because the From: header could
+ ** be fake or contain multiple addresses.
+ */
+ if (!(msgflags & MFMM)) {
+ fprintf(out, "%sSender: %s\n", resentstr, signature);
+ }
+ }
+ if (!(msgflags & MVIS)) {
+ fprintf(out, "%sBcc: undisclosed-recipients:;\n", resentstr);
+ }
+ if (badmsg) {
+ unlink(tmpfil);
+ adios(EX_DATAERR, NULL, "re-format message and try again");
+ }
}
+/*
+** Return index of the requested header in the table, or NOTOK if missing.
+*/
static int
get_header(char *header, struct headers *table)
{
struct headers *h;
- for (h = table; h->value; h++)
- if (!mh_strcasecmp(header, h->value))
+ for (h=table; h->value; h++) {
+ if (mh_strcasecmp(header, h->value)==0) {
return (h - table);
+ }
+ }
return NOTOK;
}
static void
putadr(char *name, struct mailname *nl)
{
- register struct mailname *mp, *mp2;
- register int linepos;
- register char *cp;
+ struct mailname *mp, *mp2;
+ int linepos;
+ char *cp;
int namelen;
fprintf(out, "%s: ", name);
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
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, "");
+ else if (linepos+len > OUTPUTLINELEN) {
+ 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);
static void
-insert_fcc(struct headers *hdr, unsigned char *pp)
-{
- unsigned char *cp;
-
- for (cp = pp; isspace(*cp); cp++)
- continue;
- for (pp += strlen(pp) - 1; pp > cp && isspace(*pp); pp--)
- continue;
- if (pp >= cp)
- *++pp = 0;
- if (*cp == 0)
- return;
-
- if (fccind >= FCCS)
- adios(NULL, "too many %ss", hdr->value);
- fccfold[fccind++] = getcpy(cp);
-}
-
-#if 0
-/* BCC GENERATION */
-
-static void
-make_bcc_file(void)
+process_fcc(char *str)
{
- pid_t child_id;
- int fd, i, status;
- char *vec[6];
- FILE * in, *out;
-
-#ifdef HAVE_MKSTEMP
- fd = mkstemp(bccfil);
- if (fd == -1 || (out = fdopen(fd, "w")) == NULL)
- adios(bccfil, "unable to create");
-#else
- mktemp(bccfil);
- if ((out = fopen(bccfil, "w")) == NULL)
- adios(bccfil, "unable to create");
-#endif
- 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)
- /*
- ** 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
- /* 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 ((fd = open(tmpfil, O_RDONLY)) == NOTOK)
- adios(NULL, "unable to re-open");
- cpydgst(fd, fileno(out), tmpfil, bccfil);
- close(fd);
- } else {
- vec[0] = mhbasename(mhlproc);
-
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep(5);
- switch (child_id) {
- 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");
+ char *cp, *pp;
+ int state = 0;
+ if (strlen(str)+strlen(fccs) > sizeof fccs /2) {
+ adios(EX_DATAERR, NULL, "Too much Fcc data");
+ }
+ /* todo: better have three states: SEPARATOR, PLUS, WORD */
+ for (cp=pp=str; *cp; cp++) {
+ switch (*cp) {
+ case ' ':
+ case '\t':
+ case '\n':
+ case ',':
+ if (state != 0) {
+ state = 0;
+ *cp = '\0';
+ if (*pp=='+' || *pp=='@') {
+ strcat(fccs, " ");
+ } else {
+ strcat(fccs, " +");
+ }
+ strcat(fccs, pp);
+ }
+ break;
default:
- if (status = pidwait(child_id, OK))
- admonish(NULL, "%s lost (status=0%o)",
- vec[0], status);
+ if (state == 0) {
+ state = 1;
+ pp = cp;
+ }
break;
}
}
-
- fseek(out, 0L, SEEK_END);
- fprintf(out, "\n------- End of Blind-Carbon-Copy\n");
- fclose(out);
-}
-#endif /* if 0 */
-
-/* FCC INTERACTION */
-
-static void
-file(char *path)
-{
- int i;
-
- if (fccind == 0)
- return;
-
- for (i = 0; i < fccind; i++)
- fcc(path, fccfold[i]);
}
static void
-fcc(char *file, char *folder)
+fcc(char *file, char *folders)
{
- pid_t child_id;
- int i, status;
- char fold[BUFSIZ];
+ int status;
+ char cmd[BUFSIZ];
- if (verbose)
+ if (verbose) {
printf("%sFcc: %s\n", msgstate == resent ? "Resent-" : "",
- folder);
- fflush(stdout);
-
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep(5);
- switch (child_id) {
- 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, " errored (0%o)\n",
- status);
- }
+ folders);
+ fflush(stdout);
+ }
+ if (100+strlen(file)+strlen(folders) > sizeof cmd) {
+ 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",
+ file, folders);
+ status = system(cmd);
+ if (status == -1) {
+ fprintf(stderr, "Skipped %sFcc %s: unable to system().\n",
+ msgstate == resent ? "Resent-" : "", folders);
+ } else if (status != 0) {
+ fprintf(stderr, "%sFcc %s: Problems occured.\n",
+ msgstate == resent ? "Resent-" : "", folders);
}
-
- fflush(stdout);
}
-#if 0
-
-/*
-** TERMINATION
-*/
+/* BCC GENERATION */
static void
-die(char *what, char *fmt, ...)
+process_bccs(char *origmsg)
{
- va_list ap;
-
- va_start(ap, fmt);
- advertise(what, NULL, fmt, ap);
- va_end(ap);
+ char *bccdraft = NULL;
+ struct mailname *mp = NULL;
+ FILE *out = NULL;
+
+ for (mp=bccs; mp; mp=mp->m_next) {
+ 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, "%s: %s\n", attach_hdr, origmsg);
+ fprintf(out, "------------\n");
+ fclose(out);
- done(1);
+ if (execprogl("send", "send", bccdraft, (char *)NULL) != 0) {
+ admonish(invo_name, "Problems to send Bcc to %s",
+ mp->m_text);
+ unlink(bccdraft);
+ }
+ }
}
-#endif
projects / mmh / blobdiff