Removed the mhlproc profile entry. Call mhl directly.
[mmh] / uip / repl.c
index 354bb79..dff8a9e 100644 (file)
@@ -8,6 +8,10 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include <h/addrsbr.h>
+#include <h/fmt_scan.h>
+#include <sys/file.h>  /* L_SET */
+#include <errno.h>
 
 
 static struct swit switches[] = {
@@ -27,37 +31,33 @@ static struct swit switches[] = {
        { "editor editor", 0 },
 #define NEDITSW  7
        { "noedit", 0 },
-#define FCCSW  8
-       { "fcc folder", 0 },
-#define FILTSW  9
+#define FILTSW  8
        { "filter filterfile", 0 },
+#define NFILTSW  9
+       { "nofilter", 0 },
 #define FORMSW  10
        { "form formfile", 0 },
-#define FRMTSW  11
-       { "format", 5 },
-#define NFRMTSW  12
-       { "noformat", 7 },
-#define MIMESW  13
+#define MIMESW  11
        { "mime", 0 },
-#define NMIMESW  14
+#define NMIMESW  12
        { "nomime", 0 },
-#define QURYSW  15
+#define QURYSW  13
        { "query", 0 },
-#define NQURYSW  16
+#define NQURYSW  14
        { "noquery", 0 },
-#define WHATSW  17
+#define WHATSW  15
        { "whatnowproc program", 0 },
-#define NWHATSW  18
+#define NWHATSW  16
        { "nowhatnowproc", 0 },
-#define VERSIONSW  19
+#define VERSIONSW  17
        { "version", 0 },
-#define HELPSW  20
+#define HELPSW  18
        { "help", 0 },
-#define FILESW  21
+#define FILESW  19
        { "file file", 4 },  /* interface from msh */
 
 #ifdef MHE
-#define BILDSW  22
+#define BILDSW  20
        { "build", 5 },  /* interface from mhe */
 #endif
 
@@ -76,23 +76,65 @@ static struct swit ccswitches[] = {
        { NULL, 0 }
 };
 
-short ccto = -1;  /* global for replsbr */
-short cccc = -1;
-short ccme = -1;
-short querysw = 0;
+/*
+** Buffer size for content part of header fields.
+** We want this to be large enough so that we don't
+** do a lot of extra FLDPLUS calls on m_getfld but
+** small enough so that we don't snarf the entire
+** message body when we're not going to use any of it.
+*/
+#define SBUFSIZ 256
+
+static short ccto = -1;
+static short cccc = -1;
+static short ccme = -1;
+static short querysw = 0;
+
+static short groupreply = 0;  /* Is this a group reply? */
+
+static int mime = 0;  /* include original as MIME part */
+static char *form   = NULL;  /* form (components) file */
+static char *filter = NULL;  /* message filter file */
+
+static int dftype=0;
+
+static char *badaddrs = NULL;
+static char *dfhost = NULL;
+
+static struct mailname mq = { NULL };
 
-short groupreply = 0;  /* Is this a group reply? */
+static struct format *fmt;
 
-int mime = 0;  /* include original as MIME part */
-char *form   = NULL;  /* form (components) file */
-char *filter = NULL;  /* message filter file */
-char *fcc = NULL;  /* folders to add to Fcc: header */
+static int ncomps = 0;  /* # of interesting components */
+static char **compbuffers = NULL;  /* buffers for component text */
+static struct comp **used_buf = NULL;  /* stack for comp that use buffers */
 
+static int dat[5];  /* aux. data for format routine */
+
+static char *addrcomps[] = {
+       "from",
+       "sender",
+       "reply-to",
+       "to",
+       "cc",
+       "bcc",
+       "resent-from",
+       "resent-sender",
+       "resent-reply-to",
+       "resent-to",
+       "resent-cc",
+       "resent-bcc",
+       NULL
+};
 
 /*
-** prototypes
+** static prototypes
 */
-void docc(char *, int);
+static void docc(char *, int);
+static int insert(struct mailname *);
+static void replfilter(FILE *, FILE *, char *);
+static void replout(FILE *, char *, char *, struct msgs *, int,
+               char *, char *);
 
 
 int
@@ -100,13 +142,15 @@ main(int argc, char **argv)
 {
        int anot = 0;
        int nedit = 0, nwhat = 0;
-       char *cp, *cwd, *dp, *maildir, *file = NULL;
+       char *cp, *cwd, *maildir, *file = NULL;
        char *folder = NULL, *msg = NULL;
        char *ed = NULL, drft[BUFSIZ], buf[BUFSIZ];
        char **argp, **arguments;
        struct msgs *mp = NULL;
        FILE *in;
 
+       filter = getcpy(etcpath(mhlreply));
+
 #ifdef MHE
        int buildsw = 0;
 #endif /* MHE */
@@ -191,20 +235,6 @@ main(int argc, char **argv)
                                nwhat++;
                                continue;
 
-                       case FCCSW:
-                               if (!(cp = *argp++) || *cp == '-')
-                                       adios(NULL, "missing argument to %s",
-                                                       argp[-2]);
-                               dp = NULL;
-                               if (*cp == '@')
-                                       cp = dp = getcpy(expandfol(cp));
-                               if (fcc)
-                                       fcc = add(", ", fcc);
-                               fcc = add(cp, fcc);
-                               if (dp)
-                                       free(dp);
-                               continue;
-
                        case FILESW:
                                if (file)
                                        adios(NULL, "only one file at a time!");
@@ -213,30 +243,24 @@ main(int argc, char **argv)
                                                        argp[-2]);
                                file = getcpy(expanddir(cp));
                                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",
                                                        argp[-2]);
                                continue;
 
-                       case FRMTSW:
-                               filter = getcpy(etcpath(mhlreply));
-                               mime = 0;
+                       case FILTSW:
+                               if (!(cp = *argp++) || *cp == '-')
+                                       adios(NULL, "missing argument to %s",
+                                                       argp[-2]);
+                               filter = getcpy(etcpath(cp));
                                continue;
-                       case NFRMTSW:
+                       case NFILTSW:
                                filter = NULL;
                                continue;
 
                        case MIMESW:
                                mime++;
-                               filter = NULL;
                                continue;
                        case NMIMESW:
                                mime = 0;
@@ -336,7 +360,7 @@ main(int argc, char **argv)
                        form = etcpath(replcomps);
        }
 
-       replout(in, msg, drft, mp, mime, form, filter, fcc);
+       replout(in, msg, drft, mp, mime, form, filter);
        fclose(in);
 
        if (nwhat)
@@ -347,7 +371,7 @@ main(int argc, char **argv)
        return 1;
 }
 
-void
+static void
 docc(char *cp, int ccflag)
 {
        switch (smatch(cp, ccswitches)) {
@@ -374,3 +398,402 @@ docc(char *cp, int ccflag)
                break;
        }
 }
+
+
+
+
+static void
+replout(FILE *inb, char *msg, char *drft, struct msgs *mp,
+       int mime, char *form, char *filter)
+{
+       register int state, i;
+       register struct comp *cptr;
+       register char *tmpbuf;
+       register char **nxtbuf;
+       register char **ap;
+       register struct comp **savecomp;
+       int char_read = 0, format_len, mask;
+       char name[NAMESZ], *scanl;
+       unsigned char *cp;
+       FILE *out;
+
+       mask = umask(~m_gmprot());
+       if ((out = fopen(drft, "w")) == NULL)
+               adios(drft, "unable to create");
+
+       umask(mask);
+
+       /* get new format string */
+       cp = new_fs(form, NULL);
+       format_len = strlen(cp);
+
+       /* compile format string */
+       ncomps = fmt_compile(cp, &fmt) + 1;
+
+       if (!(nxtbuf = compbuffers = (char **)
+                       calloc((size_t) ncomps, sizeof(char *))))
+               adios(NULL, "unable to allocate component buffers");
+       if (!(savecomp = used_buf = (struct comp **)
+                       calloc((size_t) (ncomps+1), sizeof(struct comp *))))
+               adios(NULL, "unable to allocate component buffer stack");
+       savecomp += ncomps + 1;
+       *--savecomp = NULL;  /* point at zero'd end minus 1 */
+
+       for (i = ncomps; i--; )
+               *nxtbuf++ = mh_xmalloc(SBUFSIZ);
+
+       nxtbuf = compbuffers;  /* point at start */
+       tmpbuf = *nxtbuf++;
+
+       for (ap = addrcomps; *ap; ap++) {
+               FINDCOMP(cptr, *ap);
+               if (cptr)
+                       cptr->c_type |= CT_ADDR;
+       }
+
+       /*
+       ** ignore any components killed by command line switches
+       */
+       if (!ccto) {
+               FINDCOMP(cptr, "to");
+               if (cptr)
+                       cptr->c_name = "";
+       }
+       if (!cccc) {
+               FINDCOMP(cptr, "cc");
+               if (cptr)
+                       cptr->c_name = "";
+       }
+       if ((cp = getenv("USER"))) {
+               FINDCOMP(cptr, "user");
+               if (cptr)
+                       cptr->c_text = getcpy(cp);
+       }
+       if (!ccme)
+               ismymbox(NULL);
+
+       /*
+       ** pick any interesting stuff out of msg "inb"
+       */
+       for (state = FLD;;) {
+               state = m_getfld(state, name, tmpbuf, SBUFSIZ, inb);
+               switch (state) {
+               case FLD:
+               case FLDPLUS:
+                       /*
+                       ** if we're interested in this component, save
+                       ** a pointer to the component text, then start
+                       ** using our next free buffer as the component
+                       ** temp buffer (buffer switching saves an extra
+                       ** copy of the component text).
+                       */
+                       if ((cptr = wantcomp[CHASH(name)]))
+                               do {
+                                       if (!mh_strcasecmp(name, cptr->c_name)) {
+                                               char_read += msg_count;
+                                               if (! cptr->c_text) {
+                                                       i = strlen(cptr->c_text = tmpbuf) - 1;
+                                                       if (tmpbuf[i] == '\n')
+                                                               tmpbuf[i] = '\0';
+                                                       *--savecomp = cptr;
+                                                       tmpbuf = *nxtbuf++;
+                                               } else {
+                                                       i = strlen(cp = cptr->c_text) - 1;
+                                                       if (cp[i] == '\n') {
+                                                               if (cptr->c_type & CT_ADDR) {
+                                                                       cp[i] = '\0';
+                                                                       cp = add(",\n\t", cp);
+                                                               } else {
+                                                                       cp = add("\t", cp);
+                                                               }
+                                                       }
+                                                       cptr->c_text = add(tmpbuf, cp);
+                                               }
+                                               while (state == FLDPLUS) {
+                                                       state = m_getfld(state, name, tmpbuf,
+                                                                                         SBUFSIZ, inb);
+                                                       cptr->c_text = add(tmpbuf, cptr->c_text);
+                                                       char_read += msg_count;
+                                               }
+                                               break;
+                                       }
+                               } while ((cptr = cptr->c_next));
+
+                       while (state == FLDPLUS)
+                               state = m_getfld(state, name, tmpbuf,
+                                               SBUFSIZ, inb);
+                       break;
+
+               case LENERR:
+               case FMTERR:
+               case BODY:
+               case FILEEOF:
+                       goto finished;
+
+               default:
+                       adios(NULL, "m_getfld() returned %d", state);
+               }
+       }
+
+       /*
+       ** format and output the header lines.
+       */
+finished:
+
+       /*
+       ** if there's a "Subject" component, strip any "Re:"s off it
+       */
+       FINDCOMP(cptr, "subject")
+       if (cptr && (cp = cptr->c_text)) {
+               register char *sp = cp;
+
+               for (;;) {
+                       while (isspace(*cp))
+                               cp++;
+                       if(uprf(cp, "re:"))
+                               cp += 3;
+                       else
+                               break;
+                       sp = cp;
+               }
+               if (sp != cptr->c_text) {
+                       cp = cptr->c_text;
+                       cptr->c_text = getcpy(sp);
+                       free(cp);
+               }
+       }
+       i = format_len + char_read + 256;
+       scanl = mh_xmalloc((size_t) i + 2);
+       dat[0] = 0;
+       dat[1] = 0;
+       dat[2] = 0;
+       dat[3] = OUTPUTLINELEN;
+       dat[4] = 0;
+       fmt_scan(fmt, scanl, i, dat);
+       fputs(scanl, out);
+       if (badaddrs) {
+               fputs("\nrepl: bad addresses:\n", out);
+               fputs( badaddrs, out);
+       }
+
+       /* Check if we should filter the message */
+       if (filter) {
+               fflush(out);
+               if (ferror(out))
+                       adios(drft, "error writing");
+
+               replfilter(inb, out, filter);
+       }
+
+       fflush(out);
+       if (ferror(out))
+               adios(drft, "error writing");
+       fclose(out);
+
+       if (mime && mp) {
+               /* add an attachment header */
+               char buffer[BUFSIZ];
+
+               snprintf(buffer, sizeof buffer, "+%s %s",
+                               mp->foldpath, m_name(mp->lowsel));
+               annotate(drft, attach_hdr, buffer, 0, -2, 1, 0);
+       }
+
+       /* return dynamically allocated buffers */
+       free(scanl);
+       for (nxtbuf = compbuffers, i = ncomps; (cptr = *savecomp++);
+                       nxtbuf++, i--)
+               free(cptr->c_text);  /* if not nxtbuf, nxtbuf already freed */
+       while ( i-- > 0)
+               free(*nxtbuf++);  /* free unused nxtbufs */
+       free((char *) compbuffers);
+       free((char *) used_buf);
+}
+
+static char *buf;  /* our current working buffer */
+static char *bufend;  /* end of working buffer */
+static char *last_dst;  /* buf ptr at end of last call */
+static unsigned int bufsiz=0;  /* current size of buf */
+
+#define BUFINCR 512  /* how much to expand buf when if fills */
+
+#define CPY(s) { cp = (s); while ((*dst++ = *cp++)) ; --dst; }
+
+/*
+** check if there's enough room in buf for str.
+** add more mem if needed
+*/
+#define CHECKMEM(str) \
+       if ((len = strlen(str)) >= bufend - dst) {\
+               int i = dst - buf;\
+               int n = last_dst - buf;\
+               bufsiz += ((dst + len - bufend) / BUFINCR + 1) * BUFINCR;\
+               buf = mh_xrealloc(buf, bufsiz);\
+               dst = buf + i;\
+               last_dst = buf + n;\
+               bufend = buf + bufsiz;\
+       }
+
+
+/*
+** fmt_scan will call this routine if the user includes the function
+** "(formataddr {component})" in a format string.  "orig" is the
+** original contents of the string register.  "str" is the address
+** string to be formatted and concatenated onto orig.  This routine
+** returns a pointer to the concatenated address string.
+**
+** We try to not do a lot of malloc/copy/free's (which is why we
+** don't call "getcpy") but still place no upper limit on the
+** length of the result string.
+**
+** This routine is an override for the equally named one in sbr/fmt_addr.c.
+** Don't delete it!
+*/
+char *
+formataddr(char *orig, char *str)
+{
+       register int len;
+       char baddr[BUFSIZ], error[BUFSIZ];
+       register int isgroup;
+       register char *dst;
+       register char *cp;
+       register char *sp;
+       register struct mailname *mp = NULL;
+
+       /* if we don't have a buffer yet, get one */
+       if (bufsiz == 0) {
+               buf = mh_xmalloc(BUFINCR);
+               last_dst = buf;  /* XXX */
+               bufsiz = BUFINCR - 6;  /* leave some slop */
+               bufend = buf + bufsiz;
+       }
+       /*
+       ** If "orig" points to our buffer we can just pick up where we
+       ** left off.  Otherwise we have to copy orig into our buffer.
+       */
+       if (orig == buf)
+               dst = last_dst;
+       else if (!orig || !*orig) {
+               dst = buf;
+               *dst = '\0';
+       } else {
+               dst = last_dst;  /* XXX */
+               CHECKMEM(orig);
+               CPY(orig);
+       }
+
+       /* concatenate all the new addresses onto 'buf' */
+       for (isgroup = 0; (cp = getname(str)); ) {
+               if ((mp = getm(cp, dfhost, dftype, AD_NAME, error)) == NULL) {
+                       snprintf(baddr, sizeof(baddr), "\t%s -- %s\n",
+                                       cp, error);
+                       badaddrs = add(baddr, badaddrs);
+                       continue;
+               }
+               if (isgroup && (mp->m_gname || !mp->m_ingrp)) {
+                       *dst++ = ';';
+                       isgroup = 0;
+               }
+               if (insert(mp)) {
+                       /* if we get here we're going to add an address */
+                       if (dst != buf) {
+                               *dst++ = ',';
+                               *dst++ = ' ';
+                       }
+                       if (mp->m_gname) {
+                               CHECKMEM(mp->m_gname);
+                               CPY(mp->m_gname);
+                               isgroup++;
+                       }
+                       sp = adrformat(mp);
+                       CHECKMEM(sp);
+                       CPY(sp);
+               }
+       }
+
+       if (isgroup)
+               *dst++ = ';';
+
+       *dst = '\0';
+       last_dst = dst;
+       return (buf);
+}
+
+
+static int
+insert(struct mailname *np)
+{
+       char buffer[BUFSIZ];
+       register struct mailname *mp;
+
+       if (np->m_mbox == NULL)
+               return 0;
+
+       for (mp = &mq; mp->m_next; mp = mp->m_next) {
+               if (!mh_strcasecmp(np->m_host, mp->m_next->m_host) &&
+                               !mh_strcasecmp(np->m_mbox, mp->m_next->m_mbox))
+                       return 0;
+       }
+       if (!ccme && ismymbox(np))
+               return 0;
+
+       if (querysw) {
+               snprintf(buffer, sizeof(buffer), "Reply to %s? ",
+                               adrformat(np));
+               if (!gans(buffer, anoyes))
+               return 0;
+       }
+       mp->m_next = np;
+
+#ifdef ISI
+       if (ismymbox(np))
+               ccme = 0;
+#endif
+
+       return 1;
+}
+
+
+/*
+** Call mhl
+**
+** This function expects that argument out has been fflushed by the caller.
+*/
+static void
+replfilter(FILE *in, FILE *out, char *filter)
+{
+       int pid;
+       char *errstr;
+
+       if (filter == NULL)
+               return;
+
+       if (access(filter, R_OK) == NOTOK)
+               adios(filter, "unable to read");
+
+       rewind(in);
+       lseek(fileno(in), (off_t) 0, SEEK_SET);
+
+       switch (pid = fork()) {
+       case NOTOK:
+               adios("fork", "unable to");
+
+       case OK:
+               dup2(fileno(in), fileno(stdin));
+               dup2(fileno(out), fileno(stdout));
+               closefds(3);
+
+               execlp("mhl", "mhl", "-form", filter, NULL);
+               errstr = strerror(errno);
+               write(2, "unable to exec mhl: ", 20);
+               write(2, errstr, strlen(errstr));
+               write(2, "\n", 1);
+               _exit(-1);
+
+       default:
+               if (pidXwait(pid, "mhl"))
+                       done(1);
+               fseek(out, 0L, SEEK_END);
+               break;
+       }
+}