Escape literal leading full stop in man/new.man.

[nmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 82b9c3e828b03908c74cf7a40ba0379abc7cbb26..4976b1c5faff005470361f560638a662a6bbde22 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -11,6 +11,71 @@
 #include <h/mts.h>
 #include <h/utils.h>
 
 #include <h/mts.h>
 #include <h/utils.h>
 

+/*
+   Purpose
+   =======
+   Reads an Internet message (RFC 5322), or one or more messages
+   stored in a maildrop in mbox (RFC 4155) or MMDF format, from a file
+   stream.  Each call to m_getfld() reads one header field, or a
+   portion of the body, in sequence.
+
+   Inputs
+   ======
+   gstate:  opaque parse state
+   bufsz:  maximum number of characters to load into buf
+   iob:  input file stream
+
+   Outputs
+   =======
+   name:  header field name (array of size NAMESZ=999)
+   buf:  either a header field body or message body
+   bufsz:  number of characters loaded into buf
+   (return value):  message parse state on return from function
+
+   Functions
+   =========
+   void m_getfld_state_destroy (m_getfld_state_t *gstate): destroys
+   the parse state pointed to by the gstate argument.
+
+   m_getfld_state_reset (m_getfld_state_t *gstate): resets the parse
+   state to FLD.
+
+   void m_unknown(FILE *iob):  Determines the message delimiter string
+   for the maildrop.  Called by inc and scan when reading from a
+   maildrop file.
+
+   State variables
+   ===============
+   m_getfld() retains state internally between calls in the
+   m_getfld_state_t variable.  These are used for detecting the end of
+   each message when reading maildrops:
+
+     char **pat_map
+     char *fdelim
+     char *delimend
+     int fdelimlen
+     char *edelim
+     int edelimlen
+     char *msg_delim
+     int msg_style
+
+   Usage
+   =====
+   m_getfld_state_t gstate = 0;
+      ...
+   int state = m_getfld (&gstate, ...);
+      ...
+   m_getfld_state_destroy (&gstate);
+
+   The state is retained internally by gstate.  To reset its state to FLD:
+   m_getfld_state_reset (&gstate);
+*/
+
+/* The following described the old implementation.  The high-level
+   structure hasn't changed, but some of the details have.  I'm
+   leaving this as-is, though, for posterity.
+ */
+

 /* 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
 /* 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


@@ -25,7 +90,7 @@
    be parsed as well.  Unfortunately the speed issue finally caught up with
    us since this routine is at the very heart of MH.
 
    be parsed as well.  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
+   To speed things up considerably, the routine Eom() was made an auxiliary

    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.
    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.


@@ -94,7 +159,7 @@
    names are typically short (~8 char) and the loop that extracts them
    might terminate on a colon, newline or max width.  I considered
    using a Vax "scanc" to locate the end of the field followed by a
    names are typically short (~8 char) and the loop that extracts them
    might terminate on a colon, newline or max width.  I considered
    using a Vax "scanc" to locate the end of the field followed by a

-   "bcopy" but the routine call overhead on a Vax is too large for this
+   "memmove" but the routine call overhead on a Vax is too large for this

    to work on short names.  If Berkeley ever makes "inline" part of the
    C optimiser (so things like "scanc" turn into inline instructions) a
    change here would be worthwhile.
    to work on short names.  If Berkeley ever makes "inline" part of the
    C optimiser (so things like "scanc" turn into inline instructions) a
    change here would be worthwhile.


@@ -110,7 +175,7 @@
    so message bodies average at least a few hundred characters.
    Assuming your system uses reasonably sized stdio buffers (1K or
    more), this routine should be able to remove the body in large
    so message bodies average at least a few hundred characters.
    Assuming your system uses reasonably sized stdio buffers (1K or
    more), this routine should be able to remove the body in large

-   (>500 byte) chunks.  The makes the cost of a call to "bcopy"
+   (>500 byte) chunks.  The makes the cost of a call to "memmove"

    small but there is a premium on checking for the eom in packed
    maildrops.  The eom pattern is always a simple string so we can
    construct an efficient pattern matcher for it (e.g., a Vax "matchc"
    small but there is a premium on checking for the eom in packed
    maildrops.  The eom pattern is always a simple string so we can
    construct an efficient pattern matcher for it (e.g., a Vax "matchc"


@@ -134,286 +199,330 @@
    there is data in "name" or "buf").
   */
 
    there is data in "name" or "buf").
   */
 

-/*
-Purpose
-=======
-Reads an Internet message (RFC 5322), or one or more messages stored in a
-maildrop in mbox (RFC 4155) or MMDF format, from a file stream.  Each call
-to m_getfld() reads one header field, or a portion of the body, in sequence.
-
-Inputs
-======
-state:  message parse state
-bufsz:  maximum number of characters to load into buf
-iob:  input file stream
-
-Outputs
-=======
-name:  header field name (array of size NAMESZ=999)
-buf:  either a header field body or message body
-bufsz:  number of characters loaded into buf
-(return value):  message parse state on return from function
-
-Functions
-=========
-void m_unknown(FILE *iob):  Determines the message delimiter string for the
-  maildrop.  Called by inc, scan, and msh when reading from a maildrop file.
-
-void m_eomsbr (int (*action)(int)):  Sets the hook to check for end of
-  message in a maildrop.  Called only by msh.
-
-Those functions save state in the State variables listed below.
-
-State variables
-===============
-m_getfld() retains state internally between calls in some state variables.
-These are used for detecting the end of each message when reading maildrops:
-static unsigned char **pat_map
-static unsigned char *fdelim
-static unsigned char *delimend
-static int fdelimlen
-static unsigned char *edelim
-static int edelimlen
-char * msg_delim
-int msg_style
-int (*eom_action)(int)
-
-Restrictions
-============
-m_getfld() is restricted to operate on one file stream at a time
-because of the retained state (see "State variables" above).  And the
-first call to m_getfld() on that file stream requires that the read
-pointer be at the beginning of the file (ftell() of 0).
-
-Current usage
-=============
-The first call to m_getfld() on a file stream is with a state of FLD.
-Subsequent calls provide the state returned by the previous call.
-Therefore, given the Restrictions above, the state variable could be
-removed from the signature and just retained internally.
-*/
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */

-static int m_Eom (int, FILE *);
-static unsigned char *matchc(int, char *, int, char *);
-
-#define eom(c,iob)     (msg_style != MS_DEFAULT && \
-                        (((c) == *msg_delim && m_Eom(c,iob)) ||\
-                         (eom_action && (*eom_action)(c))))
-
-static unsigned char **pat_map;
-
-static int msg_style = MS_DEFAULT;
-
-/*
- * The "full" delimiter string for a packed maildrop consists
- * of a newline followed by the actual delimiter.  E.g., the
- * full string for a Unix maildrop would be: "\n\nFrom ".
- * "Fdelim" points to the start of the full string and is used
- * in the BODY case of the main routine to search the buffer for
- * a possible eom.  Msg_delim points to the first character of
- * the actual delim. string (i.e., fdelim+1).  Edelim
- * points to the 2nd character of actual delimiter string.  It
- * is used in m_Eom because the first character of the string
- * has been read and matched before m_Eom is called.
- */
-static char *msg_delim = "";
-static unsigned char *fdelim;
-static unsigned char *delimend;
-static int fdelimlen;
-static unsigned char *edelim;
-static int edelimlen;
+struct m_getfld_state;
+static int m_Eom (m_getfld_state_t);

 
 

-static int (*eom_action)(int) = NULL;
+#define eom(c,s)       (s->msg_style != MS_DEFAULT && \
+                        ((c) == *s->msg_delim && m_Eom(s)))

 
 /* This replaces the old approach, with its direct access to stdio
  * internals.  It uses one fread() to load a buffer that we manage.
  *
  * MSG_INPUT_SIZE is the size of the buffer.
  * MAX_DELIMITER_SIZE is the maximum size of the delimiter used to
 
 /* This replaces the old approach, with its direct access to stdio
  * internals.  It uses one fread() to load a buffer that we manage.
  *
  * MSG_INPUT_SIZE is the size of the buffer.
  * MAX_DELIMITER_SIZE is the maximum size of the delimiter used to

- * separate messages in a maildrop, such as mbox "\nFrom ".
+ * separate messages in a maildrop, such as mbox "From ".

  *
  *

- * test/inc/lots_of_headers.txt depends on the particular value of
- * MSG_INPUT_SIZE. */
-#define MSG_INPUT_SIZE 8192
-#define MAX_DELIMITER_SIZE 32
-static struct m_getfld_buffer {
-    unsigned char msg_buf[2 * MSG_INPUT_SIZE + MAX_DELIMITER_SIZE];
-    unsigned char *readpos;
-    unsigned char *end;  /* One past the last character read in. */
+ * Some of the tests in the test suite assume a MSG_INPUT_SIZE
+ * of 8192.
+ */
+#define MSG_INPUT_SIZE NMH_BUFSIZ
+#define MAX_DELIMITER_SIZE 5
+
+struct m_getfld_state {
+    char msg_buf[2 * MSG_INPUT_SIZE + MAX_DELIMITER_SIZE];
+    char *readpos;
+    char *end;  /* One past the last character read in. */

     /* The following support tracking of the read position in the
        input file stream so that callers can interleave m_getfld()
     /* The following support tracking of the read position in the
        input file stream so that callers can interleave m_getfld()

-       calls with ftell() and fseek().  ytes_read replaces the old
-       m_getfld() msg_count global.  last_file_pos is stored when
-       leaving m_getfld()/m_unkown(), then checked on the next entry.
+       calls with ftell() and fseek().  bytes_read replaces the old
+       m_getfld() msg_count global.  last_caller_pos is stored when
+       leaving m_getfld()/m_unknown(), then checked on the next entry.

        last_internal_pos is used to remember the position used
        internally by m_getfld() (read_more(), actually). */
     off_t bytes_read;
        last_internal_pos is used to remember the position used
        internally by m_getfld() (read_more(), actually). */
     off_t bytes_read;

-    off_t total_bytes_read;
-    off_t last_file_pos;
+    off_t total_bytes_read; /* by caller, not necessarily from input file */
+    off_t last_caller_pos;

     off_t last_internal_pos;
     off_t last_internal_pos;

-} m;
+    FILE *iob;

 
 

-static void
-enter_getfld (FILE *iob, struct m_getfld_buffer *m) {
-    off_t pos = ftello (iob);
-
-    /* Rely on Restriction that the first call to m_getfld (), etc.,
-       is with the read position for the file stream set to 0. */
-    if (pos == 0) {
-       /* A new file stream, so reset the buffer state. */
-       m->readpos = m->end = m->msg_buf;
-       m->total_bytes_read = 0;
-       m->last_file_pos = m->last_internal_pos = ftello (iob);
-    } else {
-       /* If the current file stream position differs from the last one,
-          then caller must have called ftell(), so adjust. */
-       if (pos != m->last_file_pos) {
-           size_t num_read;
-
-           /* Opportunity for optimization here:  don't reread if the
-              new position had already been read into the buffer,
-              just move m->readpos to it. */
-           fseeko (iob, 0, SEEK_SET);
-           do {
-               num_read = fread (m->msg_buf, 1, MSG_INPUT_SIZE, iob);
-               pos -= num_read;
-           } while (pos > 0);
-           pos += num_read;
-           /* assert (ftello (iob) == pos); */
-           m->readpos = m->msg_buf + pos;
-           m->end = m->msg_buf + num_read;
-           m->last_internal_pos = m->last_file_pos = pos;
-           m->total_bytes_read = pos;
-       } else {
-           /* Restore the file position that we use for the input buffer. */
-           pos = m->last_internal_pos;
+    char **pat_map;
+    int msg_style;
+    /*
+     * The "full" delimiter string for a packed maildrop consists
+     * of a newline followed by the actual delimiter.  E.g., the
+     * full string for a Unix maildrop would be: "\n\nFrom ".
+     * "fdelim" points to the start of the full string and is used
+     * in the BODY case of the main routine to search the buffer for
+     * a possible eom.  Msg_delim points to the first character of
+     * the actual delim. string (i.e., fdelim+1).  edelim
+     * points to the 2nd character of actual delimiter string.  It
+     * is used in m_Eom because the first character of the string
+     * has been read and matched before m_Eom is called.
+     */
+    char *msg_delim;
+    char *fdelim;
+    char *delimend;
+    int fdelimlen;
+    char *edelim;
+    int edelimlen;
+    int state;
+    int track_filepos;
+};
+
+static
+void
+m_getfld_state_init (m_getfld_state_t *gstate, FILE *iob) {
+    m_getfld_state_t s;
+
+    NEW(s);
+    *gstate = s;
+    s->readpos = s->end = s->msg_buf;
+    s->bytes_read = s->total_bytes_read = 0;
+    s->last_caller_pos = s->last_internal_pos = 0;
+    s->iob = iob;
+    s->pat_map = NULL;
+    s->msg_style = MS_DEFAULT;
+    s->msg_delim = "";
+    s->fdelim = s->delimend = s->edelim = NULL;
+    s->fdelimlen = s->edelimlen = 0;
+    s->state = FLD;
+    s->track_filepos = 0;
+}
+
+/* scan() needs to force a state an initial state of FLD for each message. */
+void
+m_getfld_state_reset (m_getfld_state_t *gstate) {
+    if (*gstate) {
+       (*gstate)->state = FLD;
+    }
+}
+
+/* If the caller interleaves ftell*()/fseek*() calls with m_getfld()
+   calls, m_getfld() must keep track of the file position.  The caller
+   must use this function to inform m_getfld(). */
+void
+m_getfld_track_filepos (m_getfld_state_t *gstate, FILE *iob) {
+    if (! *gstate) {
+       m_getfld_state_init (gstate, iob);
+    }
+
+    (*gstate)->track_filepos = 1;
+}
+
+void m_getfld_state_destroy (m_getfld_state_t *gstate) {
+    m_getfld_state_t s = *gstate;
+
+    if (s) {
+       if (s->fdelim) {
+           free (s->fdelim-1);
+           free (s->pat_map);

        }
        }

+       free (s);
+       *gstate = 0;
+    }
+}
+
+/*
+  Summary of file and message input buffer positions:
+
+  input file      -------------------------------------------EOF
+                                 |              |
+                          last_caller_pos  last_internal_pos
+
+
+  msg_buf                   --------------------EOF
+                            |         |         |
+                         msg_buf   readpos     end
+
+                            |<>|=retained characters, difference
+                                 between last_internal_pos and
+                                 first readpos value after reading
+                                 in new chunk in read_more()
+
+  When returning from m_getfld()/m_unknown():
+  1) Save the internal file position in last_internal_pos.  That's the
+     m_getfld() position reference in the input file.
+  2) Set file stream position so that callers can use ftell().
+
+  When entering m_getfld()/m_unknown():
+  Check to see if the call had changed the file position.  If so,
+  adjust the internal position reference accordingly.  If not, restore
+  the internal file position from last_internal_pos.
+*/
+
+
+static void
+enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
+    m_getfld_state_t s;
+    off_t pos;
+    off_t pos_movement;
+
+    if (! *gstate) {
+       m_getfld_state_init (gstate, iob);
+    }
+    s = *gstate;
+    s->bytes_read = 0;
+
+    /* This is ugly and no longer necessary, but is retained just in
+       case it's needed again.  The parser used to open the input file
+       multiple times, so we had to always use the FILE * that's
+       passed to m_getfld().  Now the parser inits a new
+       m_getfld_state for each file.  See comment below about the
+       readpos shift code being currently unused. */
+    s->iob = iob;
+
+    if (!s->track_filepos)
+        return;
+
+    pos = ftello(iob);
+    if (pos == 0 && s->last_internal_pos == 0)
+        return;
+
+    if (s->last_internal_pos == 0) {
+        s->total_bytes_read = pos;
+        return;
+    }

 
 

-       fseeko (iob, pos, SEEK_SET);
+    pos_movement = pos - s->last_caller_pos; /* Can be < 0. */
+    if (pos_movement == 0) {
+        pos = s->last_internal_pos;
+    } else {
+        /* The current file stream position differs from the
+           last one, so caller must have called ftell/o().
+           Or, this is the first call and the file position
+           was not at 0. */
+
+        if (s->readpos + pos_movement >= s->msg_buf  &&
+            s->readpos + pos_movement < s->end) {
+            /* This is currently unused.  It could be used by
+               parse_mime() if it was changed to use a global
+               m_getfld_state. */
+            /* We can shift readpos and remain within the
+               bounds of msg_buf. */
+            s->readpos += pos_movement;
+            s->total_bytes_read += pos_movement;
+            pos = s->last_internal_pos;
+        } else {
+            size_t num_read;
+
+            /* This seek skips past an integral number of
+               chunks of size MSG_INPUT_SIZE. */
+            fseeko (iob, pos/MSG_INPUT_SIZE * MSG_INPUT_SIZE, SEEK_SET);
+            num_read = fread (s->msg_buf, 1, MSG_INPUT_SIZE, iob);
+            s->readpos = s->msg_buf  +  pos % MSG_INPUT_SIZE;
+            s->end = s->msg_buf + num_read;
+            s->total_bytes_read = pos;
+        }

     }
 
     }
 

-    m->bytes_read = 0;
+    fseeko (iob, pos, SEEK_SET);

 }
 
 static void
 }
 
 static void

-leave_getfld (struct m_getfld_buffer *m, FILE *iob) {
-    /* Save the internal file position that we use for the input buffer. */
-    m->last_internal_pos = ftello (iob);
-
-    /* Set file stream position so that callers can use ftell (). */
-    m->total_bytes_read += m->bytes_read;
-    fseeko (iob, m->total_bytes_read, SEEK_SET);
-    m->last_file_pos = ftello (iob);
+leave_getfld (m_getfld_state_t s) {
+    s->total_bytes_read += s->bytes_read;
+
+    if (s->track_filepos) {
+       /* Save the internal file position that we use for the input buffer. */
+       s->last_internal_pos = ftello (s->iob);
+
+       /* Set file stream position so that callers can use ftell(). */
+       fseeko (s->iob, s->total_bytes_read, SEEK_SET);
+       s->last_caller_pos = ftello (s->iob);
+    }

 }
 
 static size_t
 }
 
 static size_t

-read_more (struct m_getfld_buffer *m, FILE *iob) {
+read_more (m_getfld_state_t s) {

     /* Retain at least edelimlen characters that have already been
        read so that we can back up to them in m_Eom(). */
     /* Retain at least edelimlen characters that have already been
        read so that we can back up to them in m_Eom(). */

-    ssize_t retain = edelimlen;
+    ssize_t retain = s->edelimlen;

     size_t num_read;
 
     size_t num_read;
 

-    if (retain < m->end - m->readpos) retain = m->end - m->readpos;
-    /* assert (retain <= m->readpos - m->msg_buf <= sizeof msg_buf); */
+    if (retain < s->end - s->readpos)
+        retain = s->end - s->readpos;
+    assert (retain <= s->readpos - s->msg_buf);

 
     /* Move what we want to retain at end of the buffer to the beginning. */
 
     /* Move what we want to retain at end of the buffer to the beginning. */

-    memmove (m->msg_buf, m->readpos - retain, retain);
+    memmove (s->msg_buf, s->readpos - retain, retain);

 
 

-    m->readpos = m->msg_buf + retain;
-    num_read = fread (m->readpos, 1, MSG_INPUT_SIZE, iob);
-    m->end = m->readpos + num_read;
+    s->readpos = s->msg_buf + retain;
+    num_read = fread (s->readpos, 1, MSG_INPUT_SIZE, s->iob);
+    s->end = s->readpos + num_read;

 
     return num_read;
 }
 
 
     return num_read;
 }
 

+/* The return values of the following functions are a bit
+   subtle.  They can return 0x00 - 0xff as a valid character,
+   but EOF is typically 0xffffffff. */

 static int
 static int

-Getc (FILE *iob) {
-    if (m.end - m.readpos < 1) {
-       if (read_more (&m, iob) == 0) {
-           /* Pretend that we read a character.  That's what stdio does. */
-           ++m.readpos;
-           return EOF;
-       }
-    }
+Getc (m_getfld_state_t s) {
+    if ((s->end - s->readpos < 1 && read_more (s) == 0) ||
+        s->readpos >= s->end)
+        return EOF;

 
 

-    ++m.bytes_read;
-    return m.readpos < m.end  ?  *m.readpos++  :  EOF;
+    s->bytes_read++;
+    return (unsigned char)*s->readpos++;

 }
 
 static int
 }
 
 static int

-Peek (FILE *iob) {
-    int next_char = Getc (iob);
-    --m.readpos;
-    --m.bytes_read;
-
-    return next_char;
+Peek (m_getfld_state_t s) {
+    if (s->end - s->readpos < 1  &&  read_more (s) == 0) {
+        return EOF;
+    }
+    return s->readpos < s->end  ?  (unsigned char) *s->readpos  :  EOF;

 }
 
 static int
 }
 
 static int

-Ungetc (int c, FILE *iob) {
-    NMH_UNUSED (iob);
-
-    if (m.readpos == m.msg_buf) {
+Ungetc (int c, m_getfld_state_t s) {
+    if (s->readpos == s->msg_buf) {

        return EOF;
        return EOF;

-    } else {
-       --m.bytes_read;
-       return *--m.readpos = c;

     }
     }

+    --s->bytes_read;
+    return *--s->readpos = (unsigned char) c;

 }
 
 
 int
 }
 
 
 int

-m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
-          int *bufsz, FILE *iob)
+m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
+          FILE *iob)

 {
 {

-    register unsigned char  *bp, *cp, *ep, *sp;
-    register int cnt, c, i, j;
+    m_getfld_state_t s;
+    char *cp;
+    int max, n, c;

 
 

-    enter_getfld (iob, &m);
+    enter_getfld (gstate, iob);
+    s = *gstate;

 
 

-    if ((c = Getc(iob)) < 0) {
+    if ((c = Getc(s)) == EOF) {

        *bufsz = *buf = 0;
        *bufsz = *buf = 0;

-       leave_getfld (&m, iob);
-       return FILEEOF;
+       leave_getfld (s);
+       return s->state = FILEEOF;

     }
     }

-    if (eom (c, iob)) {
-       if (! eom_action) {
-           /* flush null messages */
-           while ((c = Getc(iob)) >= 0 && eom (c, iob))
-               ;
-
-           if (c >= 0)
-               Ungetc(c, iob);
-       }
+    if (eom (c, s)) {
+       /* flush null messages */
+       while ((c = Getc(s)) != EOF && eom (c, s))
+           ;
+
+       if (c != EOF)
+           Ungetc(c, s);

        *bufsz = *buf = 0;
        *bufsz = *buf = 0;

-       leave_getfld (&m, iob);
-       return FILEEOF;
+       leave_getfld (s);
+       return s->state = FILEEOF;

     }
 
     }
 

-    switch (state) {
-       case FLDEOF:
-       case BODYEOF:
+    switch (s->state) {

        case FLD:
            if (c == '\n' || c == '-') {
                /* we hit the header/body separator */
        case FLD:
            if (c == '\n' || c == '-') {
                /* we hit the header/body separator */

-               while (c != '\n' && (c = Getc(iob)) >= 0) continue;
-
-               if (c < 0 || (c = Getc(iob)) < 0 || eom (c, iob)) {
-                   if (! eom_action) {
-                       /* flush null messages */
-                       while ((c = Getc(iob)) >= 0 && eom (c, iob))
-                           ;
-                       if (c >= 0)
-                           Ungetc(c, iob);
-                   }
+               while (c != '\n' && (c = Getc(s)) != EOF)
+                    ;
+
+               if (c == EOF || (c = Getc(s)) == EOF || eom (c, s)) {
+                   /* flush null messages */
+                   while ((c = Getc(s)) != EOF && eom (c, s))
+                       ;
+                   if (c != EOF)
+                       Ungetc(c, s);

                    *bufsz = *buf = 0;
                    *bufsz = *buf = 0;

-                   leave_getfld (&m, iob);
-                   return FILEEOF;
+                   leave_getfld (s);
+                   return s->state = FILEEOF;

                }
                }

-               state = BODY;
+               s->state = BODY;

                goto body;
            }
            /*
                goto body;
            }
            /*


@@ -422,26 +531,26 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
             * comes first.
             */
            cp = name;
             * comes first.
             */
            cp = name;

-           i = NAMESZ - 1;
+           max = NAMESZ - 1;

            /* Get the field name.  The first time through the loop,
               this copies out the first character, which was loaded
            /* Get the field name.  The first time through the loop,
               this copies out the first character, which was loaded

-              into c prior to loop entry.  Initialize j to 1 to
+              into c prior to loop entry.  Initialize n to 1 to

               account for that. */
               account for that. */

-           for (j = 1;
-                c != ':'  &&  c != '\n'  &&  c != EOF  &&  j < i;
-                ++j, c = Getc (iob)) {
+           for (n = 1;
+                c != ':'  &&  c != '\n'  &&  c != EOF  &&  n < max;
+                ++n, c = Getc (s)) {

                *cp++ = c;
            }
 
                *cp++ = c;
            }
 

-           /* Skip next character, which is either the space after
+           /* Check for next character, which is either the space after

               the ':' or the first folded whitespace. */
            {
                int next_char;
               the ':' or the first folded whitespace. */
            {
                int next_char;

-               if (c == EOF  ||  (next_char = Peek (iob)) == EOF) {
+               if (c == EOF  ||  (next_char = Peek (s)) == EOF) {

                    *bufsz = *cp = *buf = 0;
                    advise (NULL, "eof encountered in field \"%s\"", name);
                    *bufsz = *cp = *buf = 0;
                    advise (NULL, "eof encountered in field \"%s\"", name);

-                   leave_getfld (&m, iob);
-                   return FMTERR;
+                   leave_getfld (s);
+                   return s->state = FMTERR;

                }
            }
 
                }
            }
 


@@ -462,87 +571,104 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
                /* See if buf can hold this line, since we were assuming
                 * we had a buffer of NAMESZ, not bufsz. */
                /* + 1 for the newline */
                /* See if buf can hold this line, since we were assuming
                 * we had a buffer of NAMESZ, not bufsz. */
                /* + 1 for the newline */

-               if (*bufsz < j + 1) {
+               if (*bufsz < n + 1) {

                    /* No, it can't.  Oh well, guess we'll blow up. */
                    *bufsz = *cp = *buf = 0;
                    advise (NULL, "eol encountered in field \"%s\"", name);
                    /* No, it can't.  Oh well, guess we'll blow up. */
                    *bufsz = *cp = *buf = 0;
                    advise (NULL, "eol encountered in field \"%s\"", name);

-                   state = FMTERR;
-                   break; /* to finish */
+                   s->state = FMTERR;
+                   break;

                }
                }

-               memcpy (buf, name, j - 1);
-               buf[j - 1] = '\n';
-               buf[j] = '\0';
-               /* The last character read was '\n'.  m.bytes_read
-                  (and j) include that, but it was not put into the
+               memcpy (buf, name, n - 1);
+               buf[n - 1] = '\n';
+               buf[n] = '\0';
+                /* Indicate this wasn't a header field using a character
+                   that can't appear in a header field. */
+                name[0] = ':';
+               /* The last character read was '\n'.  s->bytes_read
+                  (and n) include that, but it was not put into the

                   name array in the for loop above.  So subtract 1. */
                   name array in the for loop above.  So subtract 1. */

-               *bufsz = --m.bytes_read;  /* == j - 1 */
-               leave_getfld (&m, iob);
-               return BODY;
-           } else if (i <= j) {
+               *bufsz = --s->bytes_read;  /* == n - 1 */
+               leave_getfld (s);
+               return s->state = BODY;
+           }
+            if (max <= n) {

                /* By design, the loop above discards the last character
                    it had read.  It's in c, use it. */
                *cp++ = c;
                *bufsz = *cp = *buf = 0;
                advise (NULL, "field name \"%s\" exceeds %d bytes", name,
                        NAMESZ - 2);
                /* By design, the loop above discards the last character
                    it had read.  It's in c, use it. */
                *cp++ = c;
                *bufsz = *cp = *buf = 0;
                advise (NULL, "field name \"%s\" exceeds %d bytes", name,
                        NAMESZ - 2);

-               state = LENERR;
-               break; /* to finish */
+               s->state = LENERR;
+               break;

            }
 
            /* Trim any trailing spaces from the end of name. */
            }
 
            /* Trim any trailing spaces from the end of name. */

-           while (isspace (*--cp) && cp >= name) continue;
+           while (isspace ((unsigned char) *--cp) && cp >= name) continue;

            *++cp = 0;
            /* readpos points to the first character of the field body. */
            *++cp = 0;
            /* readpos points to the first character of the field body. */

-           /* fall through */
+           /* FALLTHRU */

 
 

-       case FLDPLUS:
+       case FLDPLUS: {

            /*
             * get (more of) the text of a field.  Take
             * characters up to the end of this field (newline
             * followed by non-blank) or bufsz-1 characters.
             */
            /*
             * get (more of) the text of a field.  Take
             * characters up to the end of this field (newline
             * followed by non-blank) or bufsz-1 characters.
             */

+           int finished;
+

            cp = buf;
            cp = buf;

-           i = *bufsz-1;
-           j = 0;
-           for (;;) {
-               while (c != '\n'  &&  c != EOF  &&  j++ < i) {
-                   *cp++ = c = Getc (iob);
+           max = *bufsz-1;
+           n = 0;
+           for (finished = 0; ! finished; ) {
+               while (c != '\n'  &&  c != EOF  &&  n++ < max) {
+                   if ((c = Getc (s)) != EOF)
+                        *cp++ = c;

                }
 
                }
 

-               if (c != EOF) c = Peek (iob);
-               if (i < j) {
-                   /* the dest buffer is full */
-                   *bufsz = m.bytes_read;
-                   state = FLDPLUS;
-                   goto finish;
+               if (c != EOF)
+                    c = Peek (s);
+               if (max < n) {
+                   /* The dest buffer is full.  Need to back the read
+                      pointer up by one because when m_getfld() is
+                      reentered, it will read a character.  Then
+                      we'll jump right to the FLDPLUS handling code,
+                      which will not store that character, but
+                      instead move on to the next one. */
+                   if (s->readpos > s->msg_buf) {
+                       --s->readpos;
+                       --s->bytes_read;
+                   }
+                   s->state = FLDPLUS;
+                   finished = 1;

                } else if (c != ' '  &&  c != '\t') {
                    /* The next character is not folded whitespace, so
                       prepare to move on to the next field.  It's OK
                       if c is EOF, it will be handled on the next
                       call to m_getfld (). */
                } else if (c != ' '  &&  c != '\t') {
                    /* The next character is not folded whitespace, so
                       prepare to move on to the next field.  It's OK
                       if c is EOF, it will be handled on the next
                       call to m_getfld (). */

-                   *bufsz = m.bytes_read;
-                   state = FLD;
-                   goto finish;
+                   s->state = FLD;
+                   finished = 1;

                } else {
                    /* Folded header field, continues on the next line. */
                } else {
                    /* Folded header field, continues on the next line. */

-                   continue;

                }
            }
                }
            }

-           *bufsz = m.bytes_read;
+           *bufsz = s->bytes_read;

            break;
            break;

+        }

 
 

-       case BODY:

        body:
        body:

+       case BODY: {

            /*
             * get the message body up to bufsz characters or the
             * end of the message.
             */
            /*
             * get the message body up to bufsz characters or the
             * end of the message.
             */

-           i = *bufsz-1;
-           /* Back up and store the current position and update cnt. */
-           bp = --m.readpos;
-           cnt = m.end - m.readpos;
-           c = cnt < i ? cnt : i;
-           if (msg_style != MS_DEFAULT && c > 1) {
+           char *bp;
+
+            name[0] = '\0';
+           max = *bufsz-1;
+           /* Back up and store the current position. */
+           bp = --s->readpos;
+           c = s->end - s->readpos < max  ?  s->end - s->readpos  :  max;
+           if (s->msg_style != MS_DEFAULT && c > 1) {

                /*
                 * packed maildrop - only take up to the (possible)
                 * start of the next message.  This "matchc" should
                /*
                 * packed maildrop - only take up to the (possible)
                 * start of the next message.  This "matchc" should


@@ -555,7 +681,9 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
                 * algorithms vs. brute force.)  Since I (currently)
                 * run MH on a vax, we use the matchc instruction. --vj
                 */
                 * algorithms vs. brute force.)  Since I (currently)
                 * run MH on a vax, we use the matchc instruction. --vj
                 */

-               if ((ep = matchc( fdelimlen, fdelim, c, bp )))
+               char *ep;
+
+                if ((ep = memmem(bp, c, s->fdelim, s->fdelimlen)))

                    c = ep - bp + 1;
                else {
                    /*
                    c = ep - bp + 1;
                else {
                    /*


@@ -571,8 +699,10 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
                     * ends with one of the characters in the pattern
                     * (excluding the first and last), we do only one test.
                     */
                     * ends with one of the characters in the pattern
                     * (excluding the first and last), we do only one test.
                     */

+                   char *sp;
+

                    ep = bp + c - 1;
                    ep = bp + c - 1;

-                   if ((sp = pat_map[*ep])) {
+                   if ((sp = s->pat_map[(unsigned char) *ep])) {

                        do {
                            /* This if() is true unless (a) the buffer is too
                             * small to contain this delimiter prefix, or
                        do {
                            /* This if() is true unless (a) the buffer is too
                             * small to contain this delimiter prefix, or


@@ -584,7 +714,7 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
                             * should have found it.  Thus it's not a delim
                             * and we know we won't get a match.
                             */
                             * should have found it.  Thus it's not a delim
                             * and we know we won't get a match.
                             */

-                           if (((sp - fdelim) + 2) <= c) {
+                           if (((sp - s->fdelim) + 2) <= c) {

                                cp = sp;
                                /* Unfortunately although fdelim has a preceding NUL
                                 * we can't use this as a sentinel in case the buffer
                                cp = sp;
                                /* Unfortunately although fdelim has a preceding NUL
                                 * we can't use this as a sentinel in case the buffer


@@ -592,9 +722,9 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
                                 * would cause us to run off the front of fdelim).
                                 */
                                while (*--ep == *--cp)
                                 * would cause us to run off the front of fdelim).
                                 */
                                while (*--ep == *--cp)

-                                   if (cp < fdelim)
+                                   if (cp < s->fdelim)

                                        break;
                                        break;

-                               if (cp < fdelim) {
+                               if (cp < s->fdelim) {

                                    /* we matched the entire delim prefix,
                                     * so only take the buffer up to there.
                                     * we know ep >= bp -- check above prevents underrun
                                    /* we matched the entire delim prefix,
                                     * so only take the buffer up to there.
                                     * we know ep >= bp -- check above prevents underrun


@@ -605,7 +735,7 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
                            }
                            /* try matching one less char of delim string */
                            ep = bp + c - 1;
                            }
                            /* try matching one less char of delim string */
                            ep = bp + c - 1;

-                       } while (--sp > fdelim);
+                       } while (--sp > s->fdelim);

                    }
                }
            }
                    }
                }
            }


@@ -613,34 +743,39 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
            /* Advance the current position to reflect the copy out.
               c is less than or equal to the number of bytes remaining
               in the read buffer, so will not overrun it. */
            /* Advance the current position to reflect the copy out.
               c is less than or equal to the number of bytes remaining
               in the read buffer, so will not overrun it. */

-           m.readpos += c;
+           s->readpos += c;

            cp = buf + c;
            /* Subtract 1 from c because the first character was read by
            cp = buf + c;
            /* Subtract 1 from c because the first character was read by

-              Getc(), and therefore already accounted for in m.bytes_read. */
-           m.bytes_read += c - 1;
-           *bufsz = m.bytes_read;
+              Getc(), and therefore already accounted for in s->bytes_read. */
+           s->bytes_read += c - 1;
+           *bufsz = s->bytes_read;

            break;
            break;

+        }

 
        default:
 
        default:

-           adios (NULL, "m_getfld() called with bogus state of %d", state);
+           adios (NULL, "m_getfld() called with bogus state of %d", s->state);

     }
     }

-finish:
+

     *cp = 0;
     *cp = 0;

+    leave_getfld (s);

 
 

-    leave_getfld (&m, iob);
-    return (state);
+    return s->state;

 }
 
 
 void
 }
 
 
 void

-m_unknown(FILE *iob)
+m_unknown(m_getfld_state_t *gstate, FILE *iob)

 {
 {

-    register int c;
+    m_getfld_state_t s;
+    int c;

     char text[MAX_DELIMITER_SIZE];
     char text[MAX_DELIMITER_SIZE];

-    register char *cp;
-    register char *delimstr;
+    char from[] = "From ";
+    char *cp;
+    char *delimstr;
+    unsigned int i;

 
 

-    enter_getfld (iob, &m);
+    enter_getfld (gstate, iob);
+    s = *gstate;

 
 /*
  * Figure out what the message delimitter string is for this
 
 /*
  * Figure out what the message delimitter string is for this


@@ -655,80 +790,75 @@ m_unknown(FILE *iob)
  * specified when nmh was built (or from the mts.conf file).
  */
 
  * specified when nmh was built (or from the mts.conf file).
  */
 

-    msg_style = MS_UNKNOWN;
+    s->msg_style = MS_UNKNOWN;

 
 

-    for (c = 0, cp = text; c < 5; ++c, ++cp) {
-       if ((*cp = Getc (iob)) == EOF) {
+    for (i = 0, cp = text; i < sizeof text; ++i, ++cp) {
+       if ((c = Getc (s)) == EOF) {
+           *cp = '\0';

            break;
            break;

+       } else {
+           *cp = c;

        }
     }
 
        }
     }
 

-    if (c == 5  &&  strncmp (text, "From ", 5) == 0) {
-       msg_style = MS_MBOX;
+    if (i == sizeof from-1  &&  strncmp (text, "From ", sizeof from-1) == 0) {
+       s->msg_style = MS_MBOX;

        delimstr = "\nFrom ";
        delimstr = "\nFrom ";

-       while ((c = Getc (iob)) != '\n' && c >= 0) continue;
-       /* m_unknown is only called on maildrop files, and they are only
-          read using m_getfld ().  The caller musn't try to read from
-          the stream directly because the file position indicator was
-          not advanced based on bytes_read, but instead on whatever
-          was read into the message buffer. */
+       while ((c = Getc(s)) != EOF && c != '\n')
+            ;

     } else {
        /* not a Unix style maildrop */
     } else {
        /* not a Unix style maildrop */

-       m.readpos -= m.bytes_read;
-       if (mmdlm2 == NULL || *mmdlm2 == 0)
-           mmdlm2 = "\001\001\001\001\n";
+       s->readpos -= s->bytes_read;
+       s->bytes_read = 0;

        delimstr = mmdlm2;
        delimstr = mmdlm2;

-       msg_style = MS_MMDF;
+       s->msg_style = MS_MMDF;

     }
     }

+

     c = strlen (delimstr);
     c = strlen (delimstr);

-    fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
-    *fdelim++ = '\0';
-    *fdelim = '\n';
-    msg_delim = (char *)fdelim+1;
-    edelim = (unsigned char *)msg_delim+1;
-    fdelimlen = c + 1;
-    edelimlen = c - 1; /* == strlen (delimstr) */
-    strcpy (msg_delim, delimstr);
-    delimend = (unsigned char *)msg_delim + edelimlen;
-    if (edelimlen <= 1)
+    s->fdelim = mh_xmalloc (c + 3); /* \0, \n, delimstr, \0 */
+    *s->fdelim++ = '\0';
+    *s->fdelim = '\n';
+    s->fdelimlen = c + 1;
+    s->msg_delim = s->fdelim+1;
+    strcpy (s->msg_delim, delimstr);
+    s->edelim = s->msg_delim+1;
+    s->edelimlen = c - 1;
+    s->delimend = s->msg_delim + s->edelimlen;
+    if (s->edelimlen <= 1)

        adios (NULL, "maildrop delimiter must be at least 2 bytes");
        adios (NULL, "maildrop delimiter must be at least 2 bytes");

+
+    /* Now malloc'd memory at s->fdelim-1 referenced several times:
+     *
+     *     delimstr         "\nFrom "      "\001\001\001\001\n"
+     *     c                6              5
+     *     s->fdelim      \0"\n\nFrom "  \0"\n\001\001\001\001\n"
+     *     s->fdelimlen     6              5
+     *     s->msg_delim     "\nFrom "      "\001\001\001\001\n"
+     *     s->edelim        "From "        "\001\001\001\n"
+     *     s->edelimlen     5              4
+     *     s->delimend      " "            "\n"
+     */
+

     /*
      * build a Boyer-Moore end-position map for the matcher in m_getfld.
      * N.B. - we don't match just the first char (since it's the newline
      * separator) or the last char (since the matchc would have found it
      * if it was a real delim).
      */
     /*
      * build a Boyer-Moore end-position map for the matcher in m_getfld.
      * N.B. - we don't match just the first char (since it's the newline
      * separator) or the last char (since the matchc would have found it
      * if it was a real delim).
      */

-    pat_map = (unsigned char **) calloc (256, sizeof(unsigned char *));
+    s->pat_map = (char **) mh_xcalloc (256, sizeof(char *));

 
 

-    for (cp = (char *) fdelim + 1; cp < (char *) delimend; cp++ )
-       pat_map[(unsigned char)*cp] = (unsigned char *) cp;
+    for (cp = s->fdelim + 1; cp < s->delimend; cp++ )
+       s->pat_map[(unsigned char)*cp] = cp;

 
 

-    if (msg_style == MS_MMDF) {
+    if (s->msg_style == MS_MMDF) {

        /* flush extra msg hdrs */
        /* flush extra msg hdrs */

-       while ((c = Getc(iob)) >= 0 && eom (c, iob))
+       while ((c = Getc(s)) != EOF && eom (c, s))

            ;
            ;

-       if (c >= 0)
-           Ungetc(c, iob);
+       if (c != EOF)
+           Ungetc(c, s);

     }
 
     }
 

-    leave_getfld (&m, iob);
-}
-
-
-void
-m_eomsbr (int (*action)(int))
-{
-    if ((eom_action = action)) {
-       msg_style = MS_MSH;
-       *msg_delim = 0;
-       fdelimlen = 1;
-       delimend = fdelim;
-    } else {
-       msg_style = MS_MMDF;
-       msg_delim = (char *)fdelim + 1;
-       fdelimlen = strlen((char *)fdelim);
-       delimend = (unsigned char *)(msg_delim + edelimlen);
-    }
+    leave_getfld (s);

 }
 
 
 }
 
 


@@ -737,20 +867,26 @@ m_eomsbr (int (*action)(int))
  */
 
 static int
  */
 
 static int

-m_Eom (int c, FILE *iob)
+m_Eom (m_getfld_state_t s)

 {
 {

-    register int i;
+    int i;

     char text[MAX_DELIMITER_SIZE];
     char *cp;
 
     char text[MAX_DELIMITER_SIZE];
     char *cp;
 

-    for (i = 0, cp = text; i < edelimlen; ++i, ++cp) {
-       if ((*cp = Getc (iob)) == EOF) {
+    for (i = 0, cp = text; i < s->edelimlen; ++i, ++cp) {
+       int c2;
+
+       if ((c2 = Getc (s)) == EOF) {
+           *cp = '\0';

            break;
            break;

+       } else {
+           *cp = c2;

        }
     }
 
        }
     }
 

-    if (i != edelimlen  ||  strncmp (text, (char *)edelim, edelimlen)) {
-       if (i == 0 && msg_style == MS_MBOX)
+    if (i != s->edelimlen  ||
+        strncmp (text, (char *)s->edelim, s->edelimlen)) {
+       if (i == 0 && s->msg_style == MS_MBOX)

            /* the final newline in the (brain damaged) unix-format
             * maildrop is part of the delimitter - delete it.
             */
            /* the final newline in the (brain damaged) unix-format
             * maildrop is part of the delimitter - delete it.
             */


@@ -759,39 +895,16 @@ m_Eom (int c, FILE *iob)
        /* Did not find delimiter, so restore the read position.
           Note that on input, a character had already been read
           with Getc().  It will be unget by m_getfld () on return. */
        /* Did not find delimiter, so restore the read position.
           Note that on input, a character had already been read
           with Getc().  It will be unget by m_getfld () on return. */

-       m.readpos -= m.bytes_read - 1;
+       s->readpos -= s->bytes_read - 1;
+       s->bytes_read = 1;

        return 0;
     }
 
        return 0;
     }
 

-    if (msg_style == MS_MBOX) {
-       while ((c = Getc (iob)) != '\n')
-           if (c < 0)
-               break;
+    if (s->msg_style == MS_MBOX) {
+       int c;
+       while ((c = Getc(s)) != EOF && c != '\n')
+            ;

     }
 
     return 1;
 }
     }
 
     return 1;
 }

-
-
-static unsigned char *
-matchc(int patln, char *pat, int strln, char *str)
-{
-       register char *es = str + strln - patln;
-       register char *sp;
-       register char *pp;
-       register char *ep = pat + patln;
-       register char pc = *pat++;
-
-       for(;;) {
-               while (pc != *str++)
-                       if (str > es)
-                               return 0;
-               if (str > es+1)
-                       return 0;
-               sp = str; pp = pat;
-               while (pp < ep && *sp++ == *pp)
-                       pp++;
-               if (pp >= ep)
-                       return ((unsigned char *)--str);
-       }
-}