#include <h/utils.h>
/*
-** 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):
** 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).
static unsigned char *matchc(int, char *, int, char *);
static unsigned char *locc(int, unsigned char *, unsigned char);
-#define eom(c,iob) (msg_style == MS_MBOX && \
+#define eom(c,iob) (ismbox && \
(((c) == *msg_delim && m_Eom(c,iob)) ||\
(eom_action && (*eom_action)(c))))
*/
int msg_count = 0;
-int msg_style = MS_DEFAULT;
+int ismbox = FALSE;
/*
** The "full" delimiter string for a packed maildrop consists
;
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))
;
cnt = ++iob->_cnt;
#endif
c = (cnt < i ? cnt : i);
- if (msg_style == MS_MBOX && c > 1) {
+ if (ismbox && c > 1) {
/*
** packed maildrop - only take up to the (possible)
** start of the next message. This "matchc" should
return (state);
}
-static char unixbuf[BUFSIZ] = "";
+static char fromline[BUFSIZ] = "";
void
-m_unknown(FILE *iob)
+thisisanmbox(FILE *iob)
{
register int c;
register long pos;
if (strncmp(text, "From ", 5)!=0) {
adios(NULL, "No Unix style (mbox) maildrop.");
}
- msg_style = MS_MBOX;
+ ismbox = TRUE;
delimstr = "\nFrom ";
- cp = unixbuf;
- while ((c = getc(iob)) != '\n' && cp - unixbuf < BUFSIZ - 1)
+ cp = fromline;
+ while ((c = getc(iob)) != '\n' && cp - fromline < BUFSIZ - 1)
*cp++ = c;
*cp = '\0';
register char *cp;
pos = ftell(iob);
- if ((i = fread(text, sizeof *text, edelimlen, iob)) != edelimlen
- || (strncmp(text, (char *)edelim, edelimlen)!=0)) {
- if (i == 0 && msg_style == MS_MBOX)
+ 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
** maildrop is part of the delimitter - delete it.
return 0;
}
- if (msg_style == MS_MBOX) {
- cp = unixbuf;
- while ((c = getc(iob)) != '\n' && c >= 0 && cp - unixbuf < BUFSIZ - 1)
+ if (ismbox) {
+ cp = fromline;
+ while ((c = getc(iob)) != '\n' && c >= 0 && cp - fromline < BUFSIZ - 1)
*cp++ = c;
- *cp = 0;
+ *cp = '\0';
}
return 1;
/*
-** Return the Return-Path and Delivery-Date
-** header information.
+** 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;
+ char *cp;
- ap = unixbuf;
- if (!(bp = strchr(ap, ' ')))
+ if (!(cp = strchr(fromline, ' '))) {
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';
+ }
+ /* Extract the Return-Path. */
+ snprintf(rp, rplen, "%.*s\n", (int)(cp - fromline), fromline);
+ /* Advance over the whitespace. */
+ while (*cp == ' ' || *cp == '\t') {
+ cp++;
+ }
+ /* Extract the Delivery-Date. */
+ snprintf(dd, ddlen, "%.*s\n", 24, cp);
+ *fromline = '\0';
return 1;
}
projects / mmh / blobdiff