#include <h/fmt_scan.h>
#include <h/tws.h>
#include <h/utils.h>
-
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
#define IFORMAT "digest-issue-%s"
#define VFORMAT "digest-volume-%s"
#define ANNOSW 0
{ "annotate", 0 },
#define NANNOSW 1
- { "noannotate", 0 },
+ { "noannotate", 2 },
#define EDITRSW 2
{ "editor editor", 0 },
-#define NEDITSW 3
- { "noedit", 0 },
-#define FILTSW 4
- { "filter filterfile", 0 },
-#define FORMSW 5
+#define FORMSW 3
{ "form formfile", 0 },
-#define FRMTSW 6
- { "format", 5 },
-#define NFRMTSW 7
- { "noformat", 7 },
-#define MIMESW 8
- { "mime", 0 },
-#define NMIMESW 9
- { "nomime", 0 },
-#define DGSTSW 10
+#define DGSTSW 4
{ "digest list", 0 },
-#define ISSUESW 11
+#define ISSUESW 5
{ "issue number", 0 },
-#define VOLUMSW 12
+#define VOLUMSW 6
{ "volume number", 0 },
-#define WHATSW 13
+#define WHATSW 7
{ "whatnowproc program", 0 },
-#define NWHATSW 14
- { "nowhatnowproc", 0 },
-#define VERSIONSW 15
- { "version", 0 },
-#define HELPSW 16
+#define VERSIONSW 8
+ { "Version", 0 },
+#define HELPSW 9
{ "help", 0 },
-
-#ifdef MHE
-#define BILDSW 17
+#define BILDSW 10
{ "build", 5 }, /* interface from mhe */
-#endif /* MHE */
-
{ NULL, 0 }
};
-static char drft[BUFSIZ];
-
-static char delim3[] =
- "\n------------------------------------------------------------\n\n";
-static char delim4[] = "\n------------------------------\n\n";
+char *version=VERSION;
-
-static struct msgs *mp = NULL; /* used a lot */
+static char drft[BUFSIZ];
+static struct msgs *mp = NULL;
/*
** static prototypes
*/
-static void mhl_draft(int, char *, int, int, char *, char *);
-static void copy_draft(int, char *, char *, int, int);
static void add_forw_hdr(char *);
static int build_form(char *, char *, int, int);
int
main(int argc, char **argv)
{
- int msgp = 0, anot = 0, mime = 0;
+ int msgp = 0, anot = 0;
int issue = 0, volume = 0;
- int nedit = 0, nwhat = 0, in;
+ int in;
int out, msgnum;
char *cp, *cwd, *maildir;
char *digest = NULL, *ed = NULL;
- char *filter = NULL, *folder = NULL;
+ char *folder = NULL;
char *form = NULL, buf[BUFSIZ], value[10];
char **argp, **arguments, *msgs[MAXARGS];
-
-#ifdef MHE
+ char *fmtstr;
int buildsw = 0;
-#endif /* MHE */
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
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 [+folder] [msgs] [switches]", 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 ANNOSW:
anot++;
case EDITRSW:
if (!(ed = *argp++) || *ed == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case WHATSW:
if (!(whatnowproc = *argp++) ||
*whatnowproc == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
- nwhat = 0;
continue;
-#ifdef MHE
+
case BILDSW:
- buildsw++; /* fall... */
-#endif /* MHE */
- case NWHATSW:
- nwhat++;
+ buildsw++;
continue;
- case FILTSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- filter = getcpy(etcpath(cp));
- mime = 0;
- continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
continue;
- case FRMTSW:
- filter = getcpy(etcpath(mhlforward));
- continue;
- case NFRMTSW:
- filter = NULL;
- continue;
-
- case MIMESW:
- mime++;
- filter = NULL;
- continue;
- case NMIMESW:
- mime = 0;
- continue;
-
case DGSTSW:
if (!(digest = *argp++) || *digest == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
- mime = 0;
continue;
case ISSUESW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
if ((issue = atoi(cp)) < 1)
- adios(NULL, "bad argument %s %s",
+ adios(EX_USAGE, NULL, "bad argument %s %s",
argp[-2], cp);
continue;
case VOLUMSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
if ((volume = atoi(cp)) < 1)
- adios(NULL, "bad argument %s %s",
+ adios(EX_USAGE, NULL, "bad argument %s %s",
argp[-2], cp);
continue;
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios(NULL, "only one folder at a time!");
+ adios(EX_USAGE, NULL, "only one folder at a time!");
else
- folder = getcpy(expandfol(cp));
+ folder = mh_xstrdup(expandfol(cp));
} else {
msgs[msgp++] = cp;
}
}
- cwd = getcpy(pwd());
-
-#ifdef MHE
- strncpy(drft, buildsw ? toabsdir("draft")
- : m_draft(seq_beyond), sizeof(drft));
-#else
- strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+ cwd = mh_xstrdup(pwd());
+ strncpy(drft, buildsw ? toabsdir("draft") : m_draft(seq_beyond),
+ sizeof(drft));
+ /*
+ ** FIXME: (concerning MHE support (buildsw) only)
+ ** There's no check if the draft already exists. mmh has removed
+ ** this case by having the draft folder. I won't add code only to
+ ** handle this legacy issue for MHE. -- meillo@marmaro.de 2012-05
+ */
/*
** Forwarding a message.
maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
- adios(maildir, "unable to change directory to");
+ adios(EX_OSERR, maildir, "unable to change directory to");
/* read folder and create message structure */
if (!(mp = folder_read(folder)))
- adios(NULL, "unable to read folder %s", folder);
+ adios(EX_IOERR, NULL, "unable to read folder %s", folder);
/* check for empty folder */
if (mp->nummsg == 0)
- adios(NULL, "no messages in %s", folder);
+ adios(EX_DATAERR, NULL, "no messages in %s", folder);
/* parse all the message ranges/sequences and set SELECTED */
- for (msgnum = 0; msgnum < msgp; msgnum++)
- if (!m_convert(mp, msgs[msgnum]))
- done(1);
+ for (msgnum = 0; msgnum < msgp; msgnum++) {
+ if (!m_convert(mp, msgs[msgnum])) {
+ exit(EX_SOFTWARE);
+ }
+ }
seq_setprev(mp); /* set the previous sequence */
- if (filter && access(filter, R_OK) == NOTOK)
- adios(filter, "unable to read");
+ if ((out = creat(drft, m_gmprot())) == NOTOK)
+ adios(EX_CANTCREAT, drft, "unable to create");
/* Open form (component) file. */
if (digest) {
issue = 0;
issue++;
}
- if (volume == 0)
+ if (volume == 0) {
snprintf(buf, sizeof(buf), VFORMAT, digest);
- if ((cp = context_find(buf)) == NULL ||
- (volume = atoi(cp)) <= 0)
- volume = 1;
+ if ((cp = context_find(buf)) == NULL ||
+ (volume = atoi(cp)) <= 0)
+ volume = 1;
+ }
if (!form)
form = digestcomps;
in = build_form(form, digest, volume, issue);
- } else
- in = open_form(&form, forwcomps);
-
- if ((out = creat(drft, m_gmprot())) == NOTOK)
- adios(drft, "unable to create");
-
- /*
- ** copy the components into the draft
- */
- cpydata(in, out, form, drft);
- close(in);
-
- /*
- ** If filter file is defined, then format the
- ** messages into the draft using mhlproc.
- */
- if (filter) {
- mhl_draft(out, digest, volume, issue, drft, filter);
- close(out);
- } else if (mime) {
- close(out);
- add_forw_hdr(drft);
+ cpydata(in, out, form, drft);
+ close(in);
} else {
- copy_draft(out, digest, drft, volume, issue);
- close(out);
+ fmtstr = new_fs(form, forwcomps);
+ if (write(out, fmtstr, strlen(fmtstr)) != (int)strlen(fmtstr)) {
+ adios(EX_IOERR, drft, "error writing");
+ }
}
+ close(out);
+
+ add_forw_hdr(drft);
if (digest) {
snprintf(buf, sizeof(buf), IFORMAT, digest);
snprintf(value, sizeof(value), "%d", issue);
- context_replace(buf, getcpy(value));
+ context_replace(buf, mh_xstrdup(value));
snprintf(buf, sizeof(buf), VFORMAT, digest);
snprintf(value, sizeof(value), "%d", volume);
- context_replace(buf, getcpy(value));
+ context_replace(buf, mh_xstrdup(value));
}
context_replace(curfolder, folder); /* update current folder */
seq_save(mp); /* synchronize sequences */
context_save(); /* save the context file */
- if (nwhat)
- done(0);
- what_now(ed, nedit, NOUSE, drft, NULL, 0, mp,
+ if (buildsw)
+ exit(EX_OK);
+ what_now(ed, NOUSE, drft, NULL, 0, mp,
anot ? "Forwarded" : NULL, cwd);
- done(1);
- return 1;
-}
-
-
-/*
-** Filter the messages you are forwarding, into the
-** draft calling the mhlproc, and reading its output
-** from a pipe.
-*/
-static void
-mhl_draft(int out, char *digest, int volume, int issue,
- char *file, char *filter)
-{
- pid_t child_id;
- int i, msgnum, pd[2];
- char *vec[MAXARGS];
- char buf1[BUFSIZ];
- char buf2[BUFSIZ];
-
- if (pipe(pd) == NOTOK)
- adios("pipe", "unable to create");
-
- 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:
- close(pd[0]);
- dup2(pd[1], 1);
- close(pd[1]);
-
- i = 1;
- vec[i++] = "-forwall";
- vec[i++] = "-form";
- vec[i++] = filter;
-
- if (digest) {
- vec[i++] = "-digest";
- vec[i++] = digest;
- vec[i++] = "-issue";
- snprintf(buf1, sizeof(buf1), "%d", issue);
- vec[i++] = buf1;
- vec[i++] = "-volume";
- snprintf(buf2, sizeof(buf2), "%d", volume);
- vec[i++] = buf2;
- }
-
- if (mp->numsel >= MAXARGS - i)
- adios(NULL, "more than %d messages for %s exec",
- MAXARGS - i, vec[0]);
-
- /*
- ** Now add the message names to filter. We can only
- ** handle about 995 messages (because vec is fixed
- ** size), but that should be plenty.
- */
- for (msgnum = mp->lowsel;
- msgnum <= mp->hghsel && i < sizeof(vec) - 1;
- msgnum++)
- if (is_selected(mp, msgnum))
- vec[i++] = getcpy(m_name(msgnum));
- vec[i] = NULL;
-
- execvp(mhlproc, vec);
- fprintf(stderr, "unable to exec ");
- perror(mhlproc);
- _exit(-1);
-
- default:
- close(pd[1]);
- cpydata(pd[0], out, vec[0], file);
- close(pd[0]);
- pidXwait(child_id, mhlproc);
- break;
- }
-}
-
-
-/*
-** Copy the messages into the draft. The messages are
-** not filtered through the mhlproc. Do dashstuffing.
-*/
-static void
-copy_draft(int out, char *digest, char *file, int volume, int issue)
-{
- int fd,i, msgcnt, msgnum;
- int len, buflen;
- register char *bp, *msgnam;
- char buffer[BUFSIZ];
-
- msgcnt = 1;
- for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
- if (is_selected(mp, msgnum)) {
- if (digest) {
- strncpy(buffer, msgnum == mp->lowsel ?
- delim3 : delim4, sizeof(buffer));
- } else {
- /* Get buffer ready to go */
- bp = buffer;
- buflen = sizeof(buffer);
-
- strncpy(bp, "\n-------", buflen);
- len = strlen(bp);
- bp += len;
- buflen -= len;
-
- if (msgnum == mp->lowsel) {
- snprintf(bp, buflen, " Forwarded Message%s", mp->numsel > 1 ? "s" : "");
- } else {
- snprintf(bp, buflen, " Message %d", msgcnt);
- }
- len = strlen(bp);
- bp += len;
- buflen -= len;
-
- strncpy(bp, "\n\n", buflen);
- }
- write(out, buffer, strlen(buffer));
-
- if ((fd = open(msgnam = m_name (msgnum), O_RDONLY))
- == NOTOK) {
- admonish(msgnam, "unable to read message");
- continue;
- }
-
- /*
- ** Copy the message. Add RFC934 quoting (dashstuffing)
- */
- cpydgst(fd, out, msgnam, file);
-
- close(fd);
- msgcnt++;
- }
- }
-
- if (digest) {
- strncpy(buffer, delim4, sizeof(buffer));
- } else {
- snprintf(buffer, sizeof(buffer),
- "\n------- End of Forwarded Message%s\n\n",
- mp->numsel > 1 ? "s" : "");
- }
- write(out, buffer, strlen(buffer));
-
- if (digest) {
- snprintf(buffer, sizeof(buffer),
- "End of %s Digest [Volume %d Issue %d]\n",
- digest, volume, issue);
- i = strlen(buffer);
- for (bp = buffer + i; i > 1; i--)
- *bp++ = '*';
- *bp++ = '\n';
- *bp = 0;
- write(out, buffer, strlen(buffer));
- }
+ return EX_OSERR;
}
add_forw_hdr(char *draft)
{
int msgnum;
- char buffer[BUFSIZ];
-
- snprintf(buffer, sizeof(buffer), "+%s", mp->foldpath);
+ char buf[BUFSIZ];
+ char *vec[MAXARGS];
+ int vecp = 0;
+
+ vec[vecp++] = "anno";
+ vec[vecp++] = "-append";
+ vec[vecp++] = "-nodate";
+ vec[vecp++] = draft;
+ vec[vecp++] = "-comp";
+ vec[vecp++] = attach_hdr;
+ vec[vecp++] = "-text";
+ snprintf(buf, sizeof buf, "+%s", mp->foldpath);
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
if (!is_selected(mp, msgnum)) {
continue;
}
- /* TODO: improve the code */
- strncat(buffer, " ", sizeof(buffer)-strlen(buffer)-1);
- strncat(buffer, m_name(msgnum),
- sizeof(buffer)-strlen(buffer)-1);
+ if (strlen(buf) + 1 + strlen(m_name(msgnum)) + 1
+ > sizeof buf) {
+ adios(EX_DATAERR, NULL, "Attachment header line too long. "
+ "Forward less messages.");
+ }
+ strcat(buf, " ");
+ strcat(buf, m_name(msgnum));
+ }
+ vec[vecp++] = buf;
+ vec[vecp] = NULL;
+ if (execprog(*vec, vec) != 0) {
+ advise(NULL, "unable to add attachment header");
}
- annotate(draft, attach_hdr, buffer, 0, -2, 1);
}
{
int in;
int fmtsize;
- register char *nfs;
+ char *fmtstr;
char *line, tmpfil[BUFSIZ];
FILE *tmp;
- register struct comp *cptr;
+ struct comp *cptr;
struct format *fmt;
int dat[5];
char *cp = NULL;
/* Get new format string */
- nfs = new_fs(form, NULL, NULL);
- fmtsize = strlen(nfs) + 256;
+ fmtstr = new_fs(form, NULL);
+ fmtsize = strlen(fmtstr) + 256;
/* Compile format string */
- fmt_compile(nfs, &fmt);
+ fmt_compile(fmtstr, &fmt);
FINDCOMP(cptr, "digest");
if (cptr)
cptr->c_text = digest;
FINDCOMP(cptr, "date");
if (cptr)
- cptr->c_text = getcpy(dtimenow(0));
+ cptr->c_text = mh_xstrdup(dtimenow());
dat[0] = issue;
dat[1] = volume;
dat[4] = 0;
cp = m_mktemp2(NULL, invo_name, NULL, &tmp);
- if (cp == NULL) adios("forw", "unable to create temporary file");
+ if (cp == NULL) {
+ adios(EX_CANTCREAT, "forw", "unable to create temporary file");
+ }
strncpy(tmpfil, cp, sizeof(tmpfil));
unlink(tmpfil);
if ((in = dup(fileno(tmp))) == NOTOK)
- adios("dup", "unable to");
+ adios(EX_OSERR, "dup", "unable to");
- line = mh_xmalloc((unsigned) fmtsize);
+ line = mh_xcalloc(fmtsize, sizeof(char));
fmt_scan(fmt, line, fmtsize, dat);
fputs(line, tmp);
- free(line);
+ mh_free0(&line);
if (fclose(tmp))
- adios(tmpfil, "error writing");
+ adios(EX_IOERR, tmpfil, "error writing");
lseek(in, (off_t) 0, SEEK_SET);
return in;
projects / mmh / blobdiff