Renamed getmymbox mh-format escape function to getmyaddr, and

[nmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 7e92f9e3ef8cd150a2fb429d3b12dfec4989ec3a..b09605474e44d88d4f83970585a107dd3bfaa31d 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -203,11 +203,11 @@
  * static prototypes
  */
 struct m_getfld_state;
  * static prototypes
  */
 struct m_getfld_state;

-static int m_Eom (m_getfld_state_t, int);
+static int m_Eom (m_getfld_state_t);

 static char *matchc(int, char *, int, char *);
 
 #define eom(c,s)       (s->msg_style != MS_DEFAULT && \
 static char *matchc(int, char *, int, char *);
 
 #define eom(c,s)       (s->msg_style != MS_DEFAULT && \

-                        ((c) == *s->msg_delim && m_Eom(s,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.


@@ -217,9 +217,9 @@ static 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 4096.
+ * of 8192.

  */
  */

-#define MSG_INPUT_SIZE 4096
+#define MSG_INPUT_SIZE NMH_BUFSIZ

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


@@ -825,7 +825,7 @@ 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 = (char **) calloc (256, sizeof(char *));
+    s->pat_map = (char **) mh_xcalloc (256, sizeof(char *));

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


@@ -847,7 +847,7 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
  */
 
 static int
  */
 
 static int

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

 {
     register int i;
     char text[MAX_DELIMITER_SIZE];
 {
     register int i;
     char text[MAX_DELIMITER_SIZE];


@@ -881,6 +881,7 @@ m_Eom (m_getfld_state_t s, int c)
     }
 
     if (s->msg_style == MS_MBOX) {
     }
 
     if (s->msg_style == MS_MBOX) {

+       int c;

        while ((c = Getc (s)) != '\n')
            if (c < 0)
                break;
        while ((c = Getc (s)) != '\n')
            if (c < 0)
                break;