X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=4a8ffdc5693d7e2132eb15d88e913e5b63bc4d0c;hp=8b4b8300dacc80edce7eae329d2d661d24c7fec5;hb=4c513fd6ebd0f1b08b8f9504b6d6c8aef2351d4a;hpb=fcde9624e6832e0dcdc6f21996b69b7e58745e3d diff --git a/uip/spost.c b/uip/spost.c index 8b4b830..4a8ffdc 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -58,10 +58,8 @@ struct swit switches[] = { #define HSUB 0x0004 /* Subject: header */ #define HTRY 0x0008 /* try to send to addrs on header */ #define HBCC 0x0010 /* don't output this header */ -#define HNGR 0x0020 /* no groups allowed in this header */ -#define HFCC 0x0040 /* FCC: type header */ -#define HNIL 0x0080 /* okay for this header not to have addrs */ -#define HIGN 0x0100 /* 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: */ @@ -81,22 +79,22 @@ struct headers { 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 }, + { "Bcc", HADR|HTRY|HBCC, MINV }, { "Message-Id", HBAD, 0 }, { "Fcc", HFCC, 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 }, @@ -128,8 +126,7 @@ static char tmpfil[] = "/tmp/spost-XXXXXX"; static char bccfil[] = "/tmp/spost-bcc-XXXXXX"; static char *subject = NULL; /* the subject field for BCC'ing */ -static char *fccfold[FCCS]; /* foldernames for FCC'ing */ -static short fccind = 0; /* index into fccfold[] */ +static char fccs[BUFSIZ] = ""; struct mailname *bccs = NULL; static struct headers *hdrtab; /* table for the message we're doing */ @@ -145,7 +142,7 @@ 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(char *, unsigned char *); +static void process_fcc(char *); static void fcc(char *, char *); static void make_bcc_draft(char *); @@ -322,8 +319,8 @@ main(int argc, char **argv) fclose(out); /* process Fcc */ - for (i=0; iflags & HIGN) { + if (hdr->flags & HIGN || !*str) { return; } + if (hdr->flags & HBAD) { advise(NULL, "illegal header line -- %s:", name); badmsg++; return; } + msgflags |= hdr->set; - if (hdr->flags & HSUB) { - if (subject) { - /* concatenate mupliple subject */ - char *cp = concat(subject, "\t", str, NULL); - free(subject); - subject = cp; - } else { - subject = getcpy(str); - } + if (hdr->flags & HFCC) { + process_fcc(str); + return; } - 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->value, pp); + if (hdr->flags & HBCC) { + 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; } - insert_fcc(hdr->value, pp); return; } - if (*str != '\n' && *str != '\0') { - if (hdr->flags & HBCC) { - struct mailname *mp = NULL; - - /* Create list of Bcc adds. */ - while ((cp = getname(str))) { - mp = getm(cp, NULL, 0, AD_HOST, NULL); - mp->m_next = bccs; /* push */ - bccs = mp; - } - } else 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 - */ - 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 + */ + /* + ** 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 + */ + + if (hdr->flags & HSUB) { + subject = getcpy(str); + } + fprintf(out, "%s: %s", name, str); } @@ -642,76 +631,69 @@ putone(char *adr, int pos, int indent) } -/* -** Insert the normalized value from pp into fccfold[]. -*/ static void -insert_fcc(char *name, unsigned char *pp) +process_fcc(char *str) { - 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) - return; + char *cp, *pp; + int state = 0; - if (fccind >= FCCS) - adios(NULL, "too many %ss", name); - fccfold[fccind++] = getcpy(cp); + if (strlen(str)+strlen(fccs) > sizeof fccs /2) { + adios(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 (state == 0) { + state = 1; + pp = cp; + } + break; + } + } } 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) { - printf("Sorry man, but we had no more forks.\n"); - } else { - fprintf(stderr, "Skipped %sFcc %s: unable to fork.\n", - msgstate == resent ? "Resent-" : "", - folder); - } - 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) { - printf(" errored (0%o)\n", status); - } else { - fprintf(stderr, " %sFcc %s: errored (0%o)\n", - msgstate == resent ? - "Resent-" : "", folder, - status); - } - } + folders); + fflush(stdout); + } + if (strlen(fileproc)+strlen(file)+strlen(folders)+100 > sizeof cmd) { + adios(NULL, "Too much Fcc data"); + } + /* hack: read from /dev/null and refile(1) won't question us */ + snprintf(cmd, sizeof cmd, "