X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fm_getfld.c;h=a3852feb2640386a36e685b489e3ae788d6f170a;hb=2abb9a7cfb0930e27062088734d306e7d78e4cc2;hp=cefedec6a1a1e32f9d1fc49119f96bd52a0a03bb;hpb=71ca16329d950bccd713a739ea430998b802aa23;p=mmh diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c index cefedec..a3852fe 100644 --- a/sbr/m_getfld.c +++ b/sbr/m_getfld.c @@ -8,53 +8,21 @@ #include #include +#include /* -** This module has a long and checkered history. First, it didn't burst -** maildrops correctly because it considered two CTRL-A:s in a row to be -** an inter-message delimiter. It really is four CTRL-A:s followed by a -** newline. Unfortunately, MMDF will convert this delimiter *inside* a -** message to a CTRL-B followed by three CTRL-A:s and a newline. This -** caused the old version of m_getfld() to declare eom prematurely. The -** fix was a lot slower than +** This module has a long and checkered history. ** -** c == '\001' && peekc (iob) == '\001' +** [ Here had been some history of delimiter problems in MMDF maildrops ... ] ** -** but it worked, and to increase generality, MBOX style maildrops could -** be parsed as well. Unfortunately the speed issue finally caught up with -** us since this routine is at the very heart of MH. +** Unfortunately the speed issue finally caught up with us since this +** routine is at the very heart of MH. To speed things up considerably, the +** routine Eom() was made an auxilary function called by the macro eom(). +** Unless we are bursting a maildrop, the eom() macro returns FALSE saying +** we aren't at the end of the message. ** -** To speed things up considerably, the routine Eom() was made an auxilary -** function called by the macro eom(). Unless we are bursting a maildrop, -** the eom() macro returns FALSE saying we aren't at the end of the -** message. +** [ ... and here had been some more of it. ] ** -** After mhl was made a built-in in msh, m_getfld() worked just fine -** (using m_unknown() at startup). Until one day: a message which was -** the result of a bursting was shown. Then, since the burst boundaries -** aren't CTRL-A:s, m_getfld() would blinding plunge on past the boundary. -** Very sad. The solution: introduce m_eomsbr(). This hook gets called -** after the end of each line (since testing for eom involves an fseek()). -** This worked fine, until one day: a message with no body portion arrived. -** Then the -** -** while (eom(c = getc(iob), iob)) -** continue; -** -** loop caused m_getfld() to return FMTERR. So, that logic was changed to -** check for (*eom_action) and act accordingly. -** -** [ Note by meillo 2011-10: -** as msh was removed from mmh, m_eomsbr() became irrelevant. ] -** -** This worked fine, until one day: someone didn't use four CTRL:A's as -** their delimiters. So, the bullet got bit and we read mts.h and -** continue to struggle on. It's not that bad though, since the only time -** the code gets executed is when inc (or msh) calls it, and both of these -** have already called mts_init(). -** -** [ Note by meillo 2012-02: -** MMDF-style maildrops (4x ^A) and mts_init() were removed. ] ** ** ------------------------ ** (Written by Van Jacobson for the mh6 m_getfld, January, 1986): @@ -76,9 +44,8 @@ ** If you hack on this and slow it down, I, my children and my ** children's children will curse you. ** -** This routine gets used on three different types of files: normal, -** single msg files, "packed" unix or mmdf mailboxs (when used by inc) -** and packed, directoried bulletin board files (when used by msh). +** This routine gets used on two different types of files: normal, +** single msg files and "packed" unix mailboxs (when used by inc). ** The biggest impact of different file types is in "eom" testing. The ** code has been carefully organized to test for eom at appropriate ** times and at no other times (since the check is quite expensive). @@ -188,14 +155,6 @@ static int (*eom_action)(int) = NULL; # define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC #endif -#ifdef SCO_5_STDIO -# define _ptr __ptr -# define _cnt __cnt -# define _base __base -# define _filbuf(fp) ((fp)->__cnt = 0, __filbuf(fp)) -# define DEFINED__FILBUF_TO_SOMETHING_SPECIFIC -#endif - #ifndef DEFINED__FILBUF_TO_SOMETHING_SPECIFIC extern int _filbuf(FILE*); #endif @@ -236,7 +195,7 @@ m_getfld(int state, unsigned char *name, unsigned char *buf, ; if (c < 0 || (c = getc(iob)) < 0 || eom(c, iob)) { - if (! eom_action) { + if (!eom_action) { /* flush null messages */ while ((c = getc(iob)) >= 0 && eom(c, iob)) ; @@ -465,8 +424,8 @@ m_getfld(int state, unsigned char *name, unsigned char *buf, *cp++ = j = *(iob->_ptr + c); c = _filbuf(iob); #endif - if (c == EOF || - ((j == '\0' || j == '\n') && c != ' ' && c != '\t')) { + if (c == EOF || ((j == '\0' || j == '\n') + && c != ' ' && c != '\t')) { if (c != EOF) { #ifdef LINUX_STDIO --iob->_IO_read_ptr; @@ -612,17 +571,21 @@ finish: return (state); } -static char unixbuf[BUFSIZ] = ""; void -m_unknown(FILE *iob) +thisisanmbox(FILE *iob) { register int c; - register long pos; char text[10]; register char *cp; register char *delimstr; + c = getc(iob); + if (feof(iob)) { + return; + } + ungetc(c, iob); + /* ** Figure out what the message delimitter string is for this ** maildrop. (This used to be part of m_Eom but I didn't like @@ -635,7 +598,6 @@ m_unknown(FILE *iob) ** abort. */ - pos = ftell(iob); if (fread(text, sizeof(*text), 5, iob) != 5) { adios(NULL, "Read error"); } @@ -644,11 +606,9 @@ m_unknown(FILE *iob) } ismbox = TRUE; delimstr = "\nFrom "; - cp = unixbuf; - while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1) - *cp++ = c; - *cp = '\0'; - + while ((c = getc(iob)) != '\n' && c >= 0) { + continue; + } c = strlen(delimstr); fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3)); *fdelim++ = '\0'; @@ -684,11 +644,10 @@ m_Eom(int c, FILE *iob) register long pos = 0L; register int i; char text[10]; - register char *cp; pos = ftell(iob); - if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen - || (strncmp(text, (char *)edelim, edelimlen)!=0)) { + if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen || + (strncmp(text, (char *)edelim, edelimlen)!=0)) { if (i == 0 && ismbox) /* ** the final newline in the (brain damaged) unix-format @@ -702,50 +661,15 @@ m_Eom(int c, FILE *iob) } if (ismbox) { - cp = unixbuf; - while ((c = getc(iob)) != '\n' && c >= 0 && cp - unixbuf < BUFSIZ - 1) - *cp++ = c; - *cp = 0; + while ((c = getc(iob)) != '\n' && c >= 0) { + continue; + } } return 1; } -/* -** Return the Return-Path and Delivery-Date -** header information. -** -** Currently, I'm assuming that the "From " line takes the following form: -** "From" sender@host date (sendmail delivery) -*/ -int -get_returnpath(char *rp, int rplen, char *dd, int ddlen) -{ - char *ap, *bp; - - ap = unixbuf; - if (!(bp = strchr(ap, ' '))) - return 0; - - /* Get the Return-Path information from the "From " envelope. */ - snprintf(rp, rplen, "%.*s\n", (int)(bp - ap), ap); - - /* - ** advance over the spaces to get to - ** delivery date on envelope - */ - while (*bp == ' ') - bp++; - - /* Now get delivery date from envelope */ - snprintf(dd, ddlen, "%.*s\n", 24, bp); - - *unixbuf = '\0'; - return 1; -} - - static unsigned char * matchc(int patln, char *pat, int strln, char *str) {