ap: Fix write past end of addrs[] array.

[nmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 8303b54a4a08579334cf4a8e52356a3101fb9476..5c5b4a3a88274646175e993af895e64593bd5282 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,73 +199,15 @@
    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
-======
-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_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.
-
-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:
-
-  unsigned char **pat_map
-  unsigned char *fdelim
-  unsigned char *delimend
-  int fdelimlen
-  unsigned char *edelim
-  int edelimlen
-  char *msg_delim
-  int msg_style
-  int (*eom_action)(int)
-
-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);
-*/
-

 /*
  * static prototypes
  */
 struct m_getfld_state;
 /*
  * static prototypes
  */
 struct m_getfld_state;

-static int m_Eom (m_getfld_state_t, int);
-static unsigned char *matchc(int, char *, int, char *);
+static int m_Eom (m_getfld_state_t);
+static char *matchc(int, char *, int, char *);

 
 #define eom(c,s)       (s->msg_style != MS_DEFAULT && \
 
 #define eom(c,s)       (s->msg_style != MS_DEFAULT && \

-                        (((c) == *s->msg_delim && m_Eom(s,c)) || \
-                         (s->eom_action && (*s->eom_action)(c))))
+                        ((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.
 
 /* This replaces the old approach, with its direct access to stdio
  * internals.  It uses one fread() to load a buffer that we manage.


@@ -210,17 +217,18 @@ static unsigned char *matchc(int, char *, int, char *);
  * separate messages in a maildrop, such as mbox "From ".
  *
  * Some of the tests in the test suite assume a MSG_INPUT_SIZE
  * separate messages in a maildrop, such as mbox "From ".
  *
  * Some of the tests in the test suite assume a MSG_INPUT_SIZE

- * of 8192. */
-#define MSG_INPUT_SIZE (BUFSIZ >= 1024 ? BUFSIZ : 1024)
+ * of 8192.
+ */
+#define MSG_INPUT_SIZE NMH_BUFSIZ

 #define MAX_DELIMITER_SIZE 5
 
 struct m_getfld_state {
 #define MAX_DELIMITER_SIZE 5
 
 struct m_getfld_state {

-    unsigned char msg_buf[2 * MSG_INPUT_SIZE + MAX_DELIMITER_SIZE];
-    unsigned char *readpos;
-    unsigned char *end;  /* One past the last character read in. */
+    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
+       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
        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


@@ -231,64 +239,78 @@ struct m_getfld_state {
     off_t last_internal_pos;
     FILE *iob;
 
     off_t last_internal_pos;
     FILE *iob;
 

-    unsigned char **pat_map;
+    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 ".
     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
+     * "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
      * 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
+     * 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;
      * 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;

-    unsigned char *fdelim;
-    unsigned char *delimend;
+    char *fdelim;
+    char *delimend;

     int fdelimlen;
     int fdelimlen;

-    unsigned char *edelim;
+    char *edelim;

     int edelimlen;
     int edelimlen;

-    int (*eom_action)(int);

     int state;
     int state;

+    int track_filepos;

 };
 
 static
 void
 };
 
 static
 void

-m_getfld_state_init (m_getfld_state_t *gstate) {
+m_getfld_state_init (m_getfld_state_t *gstate, FILE *iob) {

     m_getfld_state_t s;
 
     m_getfld_state_t s;
 

-    s = *gstate = (m_getfld_state_t) mh_xmalloc(sizeof (struct m_getfld_state));
+    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->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 gets loaded on every call to m_getfld()/m_unknown(). */
+    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->pat_map = NULL;
     s->msg_style = MS_DEFAULT;
     s->msg_delim = "";
     s->fdelim = s->delimend = s->edelim = NULL;
     s->fdelimlen = s->edelimlen = 0;

-    s->eom_action = NULL;

     s->state = FLD;
     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) {
 }
 
 /* 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) {
     if (! *gstate) {

-       m_getfld_state_init (gstate);
+       m_getfld_state_init (gstate, iob);

     }
 
     }
 

-    (*gstate)->state = FLD;
+    (*gstate)->track_filepos = 1;

 }
 
 void m_getfld_state_destroy (m_getfld_state_t *gstate) {
     m_getfld_state_t s = *gstate;
 
     if (s) {
 }
 
 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);
+       if (s->fdelim) {
+           free (s->fdelim-1);
+           free (s->pat_map);
+       }

        free (s);
        *gstate = 0;
     }
        free (s);
        *gstate = 0;
     }


@@ -326,73 +348,82 @@ void m_getfld_state_destroy (m_getfld_state_t *gstate) {
 static void
 enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
     m_getfld_state_t s;
 static void
 enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
     m_getfld_state_t s;

-    off_t pos = ftello (iob);
+    off_t pos;
+    off_t pos_movement;

 
     if (! *gstate) {
 
     if (! *gstate) {

-       m_getfld_state_init (gstate);
+       m_getfld_state_init (gstate, iob);

     }
     s = *gstate;
     s->bytes_read = 0;
 
     }
     s = *gstate;
     s->bytes_read = 0;
 

-    /* Ugly.  The parser (used to) open the input file multiple times,
-       so we have to always use the FILE * that's passed to
-       m_getfld().  Though this might not be necessary any more, as
-       long as the parser inits a new m_getfld_state for each file.
-       See comment below about the readpos shift code being currently
-       unused. */
+    /* 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;
 
     s->iob = iob;
 

-    if (pos != 0  ||  s->last_internal_pos != 0) {
-       if (s->last_internal_pos == 0) {
-           s->total_bytes_read = pos;
-       } else {
-           off_t 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;
-               }
-           }
+    if (!s->track_filepos)
+        return;

 
 

-           fseeko (iob, pos, SEEK_SET);
-       }
+    pos = ftello(iob);
+    if (pos == 0 && s->last_internal_pos == 0)
+        return;
+
+    if (s->last_internal_pos == 0) {
+        s->total_bytes_read = pos;
+        return;

     }
     }

+
+    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;
+        }
+    }
+
+    fseeko (iob, pos, SEEK_SET);

 }
 
 static void
 leave_getfld (m_getfld_state_t s) {
 }
 
 static void
 leave_getfld (m_getfld_state_t s) {

-    /* 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(). */

     s->total_bytes_read += s->bytes_read;
     s->total_bytes_read += s->bytes_read;

-    fseeko (s->iob, s->total_bytes_read, SEEK_SET);
-    s->last_caller_pos = ftello (s->iob);
+
+    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


@@ -403,7 +434,7 @@ read_more (m_getfld_state_t s) {
     size_t num_read;
 
     if (retain < s->end - s->readpos) retain = s->end - s->readpos;
     size_t num_read;
 
     if (retain < s->end - s->readpos) retain = s->end - s->readpos;

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

 
     /* Move what we want to retain at end of the buffer to the beginning. */
     memmove (s->msg_buf, s->readpos - retain, retain);
 
     /* Move what we want to retain at end of the buffer to the beginning. */
     memmove (s->msg_buf, s->readpos - retain, retain);


@@ -415,69 +446,60 @@ read_more (m_getfld_state_t s) {
     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
 Getc (m_getfld_state_t s) {
 static int
 Getc (m_getfld_state_t s) {

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

 
 

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

 }
 
 static int
 Peek (m_getfld_state_t s) {
 }
 
 static int
 Peek (m_getfld_state_t s) {

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

     }
     }

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

 }
 
 static int
 Ungetc (int c, m_getfld_state_t s) {
     if (s->readpos == s->msg_buf) {
        return EOF;
 }
 
 static int
 Ungetc (int c, m_getfld_state_t s) {
     if (s->readpos == s->msg_buf) {
        return EOF;

-    } else {
-       --s->bytes_read;
-       return *--s->readpos = c;

     }
     }

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

 }
 
 
 int
 }
 
 
 int

-m_getfld (m_getfld_state_t *gstate, 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)

 {
     m_getfld_state_t s;
 {
     m_getfld_state_t s;

-    register unsigned char *cp;
-    register int max, n, c;
+    char *cp;
+    int max, n, c;

 
     enter_getfld (gstate, iob);
     s = *gstate;
 
 
     enter_getfld (gstate, iob);
     s = *gstate;
 

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

        *bufsz = *buf = 0;
        leave_getfld (s);
        return s->state = FILEEOF;
     }
     if (eom (c, s)) {
        *bufsz = *buf = 0;
        leave_getfld (s);
        return s->state = FILEEOF;
     }
     if (eom (c, s)) {

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

 
 

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

        *bufsz = *buf = 0;
        leave_getfld (s);
        return s->state = FILEEOF;
        *bufsz = *buf = 0;
        leave_getfld (s);
        return s->state = FILEEOF;


@@ -487,16 +509,15 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
        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(s)) >= 0) continue;
-
-               if (c < 0 || (c = Getc(s)) < 0 || eom (c, s)) {
-                   if (! s->eom_action) {
-                       /* flush null messages */
-                       while ((c = Getc(s)) >= 0 && eom (c, s))
-                           ;
-                       if (c >= 0)
-                           Ungetc(c, s);
-                   }
+               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;
                    leave_getfld (s);
                    return s->state = FILEEOF;
                    *bufsz = *buf = 0;
                    leave_getfld (s);
                    return s->state = FILEEOF;


@@ -560,13 +581,17 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
                memcpy (buf, name, n - 1);
                buf[n - 1] = '\n';
                buf[n] = '\0';
                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. */
                *bufsz = --s->bytes_read;  /* == n - 1 */
                leave_getfld (s);
                return s->state = BODY;
                /* 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. */
                *bufsz = --s->bytes_read;  /* == n - 1 */
                leave_getfld (s);
                return s->state = BODY;

-           } else if (max <= n) {
+           }
+            if (max <= n) {

                /* By design, the loop above discards the last character
                    it had read.  It's in c, use it. */
                *cp++ = c;
                /* By design, the loop above discards the last character
                    it had read.  It's in c, use it. */
                *cp++ = c;


@@ -578,7 +603,7 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
            }
 
            /* 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. */
            /* fall through */
            *++cp = 0;
            /* readpos points to the first character of the field body. */
            /* fall through */


@@ -596,12 +621,21 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
            n = 0;
            for (finished = 0; ! finished; ) {
                while (c != '\n'  &&  c != EOF  &&  n++ < max) {
            n = 0;
            for (finished = 0; ! finished; ) {
                while (c != '\n'  &&  c != EOF  &&  n++ < max) {

-                   *cp++ = c = Getc (s);
+                   if ((c = Getc (s)) != EOF) { *cp++ = c; }

                }
 
                if (c != EOF) c = Peek (s);
                if (max < n) {
                }
 
                if (c != EOF) c = Peek (s);
                if (max < n) {

-                   /* the dest buffer is full */
+                   /* 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') {
                    s->state = FLDPLUS;
                    finished = 1;
                } else if (c != ' '  &&  c != '\t') {


@@ -625,8 +659,9 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
             * 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.
             */

-           unsigned char *bp;
+           char *bp;

 
 

+            name[0] = '\0';

            max = *bufsz-1;
            /* Back up and store the current position. */
            bp = --s->readpos;
            max = *bufsz-1;
            /* Back up and store the current position. */
            bp = --s->readpos;


@@ -644,7 +679,7 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
                 * 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
                 */

-               unsigned char *ep;
+               char *ep;

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


@@ -662,10 +697,10 @@ m_getfld (m_getfld_state_t *gstate, unsigned char name[NAMESZ],
                     * 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.
                     */

-                   unsigned char *sp;
+                   char *sp;

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

-                   if ((sp = s->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


@@ -730,11 +765,11 @@ void
 m_unknown(m_getfld_state_t *gstate, FILE *iob)
 {
     m_getfld_state_t s;
 m_unknown(m_getfld_state_t *gstate, FILE *iob)
 {
     m_getfld_state_t s;

-    register int c;
+    int c;

     char text[MAX_DELIMITER_SIZE];
     char from[] = "From ";
     char text[MAX_DELIMITER_SIZE];
     char from[] = "From ";

-    register char *cp;
-    register char *delimstr;
+    char *cp;
+    char *delimstr;

     unsigned int i;
 
     enter_getfld (gstate, iob);
     unsigned int i;
 
     enter_getfld (gstate, iob);


@@ -756,31 +791,36 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
     s->msg_style = MS_UNKNOWN;
 
     for (i = 0, cp = text; i < sizeof text; ++i, ++cp) {
     s->msg_style = MS_UNKNOWN;
 
     for (i = 0, cp = text; i < sizeof text; ++i, ++cp) {

-       if ((*cp = Getc (s)) == EOF) {
+       if ((c = Getc (s)) == EOF) {
+           *cp = '\0';

            break;
            break;

+       } else {
+           *cp = c;

        }
     }
 
     if (i == sizeof from-1  &&  strncmp (text, "From ", sizeof from-1) == 0) {
        s->msg_style = MS_MBOX;
        delimstr = "\nFrom ";
        }
     }
 
     if (i == sizeof from-1  &&  strncmp (text, "From ", sizeof from-1) == 0) {
        s->msg_style = MS_MBOX;
        delimstr = "\nFrom ";

-       while ((c = Getc (s)) != '\n' && c >= 0) continue;
+       while ((c = Getc(s)) != EOF && c != '\n')
+            ;

     } else {
        /* not a Unix style maildrop */
        s->readpos -= s->bytes_read;
     } else {
        /* not a Unix style maildrop */
        s->readpos -= s->bytes_read;

+       s->bytes_read = 0;

        delimstr = mmdlm2;
        s->msg_style = MS_MMDF;
     }
     c = strlen (delimstr);
        delimstr = mmdlm2;
        s->msg_style = MS_MMDF;
     }
     c = strlen (delimstr);

-    s->fdelim = (unsigned char *) mh_xmalloc((size_t) (c + 3));
+    s->fdelim = mh_xmalloc (c + 3);

     *s->fdelim++ = '\0';
     *s->fdelim = '\n';
     *s->fdelim++ = '\0';
     *s->fdelim = '\n';

-    s->msg_delim = (char *)s->fdelim+1;
-    s->edelim = (unsigned char *)s->msg_delim+1;
+    s->msg_delim = s->fdelim+1;
+    s->edelim = s->msg_delim+1;

     s->fdelimlen = c + 1;
     s->edelimlen = c - 1; /* == strlen (delimstr) */
     strcpy (s->msg_delim, delimstr);
     s->fdelimlen = c + 1;
     s->edelimlen = c - 1; /* == strlen (delimstr) */
     strcpy (s->msg_delim, delimstr);

-    s->delimend = (unsigned char *)s->msg_delim + s->edelimlen;
+    s->delimend = s->msg_delim + s->edelimlen;

     if (s->edelimlen <= 1)
        adios (NULL, "maildrop delimiter must be at least 2 bytes");
     /*
     if (s->edelimlen <= 1)
        adios (NULL, "maildrop delimiter must be at least 2 bytes");
     /*


@@ -789,16 +829,16 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
      * separator) or the last char (since the matchc would have found it
      * if it was a real delim).
      */
      * separator) or the last char (since the matchc would have found it
      * if it was a real delim).
      */

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

 
 

-    for (cp = (char *) s->fdelim + 1; cp < (char *) s->delimend; cp++ )
-       s->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 (s->msg_style == MS_MMDF) {
        /* flush extra msg hdrs */
 
     if (s->msg_style == MS_MMDF) {
        /* flush extra msg hdrs */

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

            ;
            ;

-       if (c >= 0)
+       if (c != EOF)

            Ungetc(c, s);
     }
 
            Ungetc(c, s);
     }
 


@@ -806,37 +846,25 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
 }
 
 
 }
 
 

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

 /*
  * test for msg delimiter string
  */
 
 static int
 /*
  * test for msg delimiter string
  */
 
 static int

-m_Eom (m_getfld_state_t s, int c)
+m_Eom (m_getfld_state_t s)

 {
 {

-    register int i;
+    int i;

     char text[MAX_DELIMITER_SIZE];
     char *cp;
 
     for (i = 0, cp = text; i < s->edelimlen; ++i, ++cp) {
     char text[MAX_DELIMITER_SIZE];
     char *cp;
 
     for (i = 0, cp = text; i < s->edelimlen; ++i, ++cp) {

-       if ((*cp = Getc (s)) == EOF) {
+       int c2;
+
+       if ((c2 = Getc (s)) == EOF) {
+           *cp = '\0';

            break;
            break;

+       } else {
+           *cp = c2;

        }
     }
 
        }
     }
 


@@ -852,27 +880,28 @@ m_Eom (m_getfld_state_t s, int c)
           Note that on input, a character had already been read
           with Getc().  It will be unget by m_getfld () on return. */
        s->readpos -= s->bytes_read - 1;
           Note that on input, a character had already been read
           with Getc().  It will be unget by m_getfld () on return. */
        s->readpos -= s->bytes_read - 1;

+       s->bytes_read = 1;

        return 0;
     }
 
     if (s->msg_style == MS_MBOX) {
        return 0;
     }
 
     if (s->msg_style == MS_MBOX) {

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

     }
 
     return 1;
 }
 
 
     }
 
     return 1;
 }
 
 

-static unsigned char *
+static char *

 matchc(int patln, char *pat, int strln, char *str)
 {
 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++;
+       char *es = str + strln - patln;
+       char *sp;
+       char *pp;
+       char *ep = pat + patln;
+       char pc = *pat++;

 
        for(;;) {
                while (pc != *str++)
 
        for(;;) {
                while (pc != *str++)


@@ -884,6 +913,6 @@ matchc(int patln, char *pat, int strln, char *str)
                while (pp < ep && *sp++ == *pp)
                        pp++;
                if (pp >= ep)
                while (pp < ep && *sp++ == *pp)
                        pp++;
                if (pp >= ep)

-                       return ((unsigned char *)--str);
+                       return --str;

        }
 }
        }
 }