Look at post instead of inc to determine build options in build_nmh.

[nmh] / sbr / m_getfld.c

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 4a512269c6cc9a435bcc50b362a441d7c057b206..45bcebabda08e16d2ded8eb582d821957bd2b527 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -53,11 +53,11 @@
    m_getfld_state_t variable.  These are used for detecting the end of
    each message when reading maildrops:
 
    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
+     char **pat_map
+     char *fdelim
+     char *delimend

      int fdelimlen
      int fdelimlen

-     unsigned char *edelim
+     char *edelim

      int edelimlen
      char *msg_delim
      int msg_style
      int edelimlen
      char *msg_delim
      int msg_style


@@ -208,7 +208,7 @@
  */
 struct m_getfld_state;
 static int m_Eom (m_getfld_state_t, int);
  */
 struct m_getfld_state;
 static int m_Eom (m_getfld_state_t, int);

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

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


@@ -222,15 +222,15 @@ 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.
+ * of 4096.

  */
  */

-#define MSG_INPUT_SIZE (BUFSIZ >= 1024 ? BUFSIZ : 1024)
+#define MSG_INPUT_SIZE 4096

 #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()
        calls with ftell() and fseek().  ytes_read replaces the old
     /* 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


@@ -244,7 +244,7 @@ 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
     int msg_style;
     /*
      * The "full" delimiter string for a packed maildrop consists


@@ -259,13 +259,14 @@ struct m_getfld_state {
      * has been read and matched before m_Eom is called.
      */
     char *msg_delim;
      * 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 (*eom_action)(int);
     int state;
     int edelimlen;
     int (*eom_action)(int);
     int state;

+    int track_filepos;

 };
 
 static
 };
 
 static


@@ -285,6 +286,7 @@ m_getfld_state_init (m_getfld_state_t *gstate, FILE *iob) {
     s->fdelimlen = s->edelimlen = 0;
     s->eom_action = NULL;
     s->state = FLD;
     s->fdelimlen = s->edelimlen = 0;
     s->eom_action = NULL;
     s->state = FLD;

+    s->track_filepos = 0;

 }
 
 /* scan() needs to force a state an initial state of FLD for each message. */
 }
 
 /* scan() needs to force a state an initial state of FLD for each message. */


@@ -295,6 +297,18 @@ m_getfld_state_reset (m_getfld_state_t *gstate) {
     }
 }
 
     }
 }
 

+/* 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;
 
 void m_getfld_state_destroy (m_getfld_state_t *gstate) {
     m_getfld_state_t s = *gstate;
 


@@ -353,7 +367,7 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
        readpos shift code being currently unused. */
     s->iob = iob;
 
        readpos shift code being currently unused. */
     s->iob = iob;
 

-    if (pos != 0  ||  s->last_internal_pos != 0) {
+    if (s->track_filepos  &&  (pos != 0  ||  s->last_internal_pos != 0)) {

        if (s->last_internal_pos == 0) {
            s->total_bytes_read = pos;
        } else {
        if (s->last_internal_pos == 0) {
            s->total_bytes_read = pos;
        } else {


@@ -397,13 +411,16 @@ enter_getfld (m_getfld_state_t *gstate, FILE *iob) {
 
 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


@@ -414,7 +431,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);


@@ -426,6 +443,9 @@ 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) {
     if (s->end - s->readpos < 1) {
 static int
 Getc (m_getfld_state_t s) {
     if (s->end - s->readpos < 1) {


@@ -437,7 +457,7 @@ Getc (m_getfld_state_t s) {
     }
 
     ++s->bytes_read;
     }
 
     ++s->bytes_read;

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

 }
 
 static int
 }
 
 static int


@@ -450,7 +470,7 @@ Peek (m_getfld_state_t s) {
        }
     }
 
        }
     }
 

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

 }
 
 static int
 }
 
 static int


@@ -459,17 +479,17 @@ Ungetc (int c, m_getfld_state_t s) {
        return EOF;
     } else {
        --s->bytes_read;
        return EOF;
     } else {
        --s->bytes_read;

-       return *--s->readpos = c;
+       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 char *cp;

     register int max, n, c;
 
     enter_getfld (gstate, iob);
     register int max, n, c;
 
     enter_getfld (gstate, iob);


@@ -589,7 +609,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 */


@@ -636,7 +656,7 @@ 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;

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


@@ -655,7 +675,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;


@@ -673,10 +693,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


@@ -783,15 +803,15 @@ m_unknown(m_getfld_state_t *gstate, FILE *iob)
        s->msg_style = MS_MMDF;
     }
     c = strlen (delimstr);
        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");
     /*


@@ -800,10 +820,10 @@ 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 **) calloc (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 */


@@ -827,9 +847,9 @@ m_eomsbr (m_getfld_state_t s, int (*action)(int))
        s->delimend = s->fdelim;
     } else {
        s->msg_style = MS_MMDF;
        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);
+       s->msg_delim = s->fdelim + 1;
+       s->fdelimlen = strlen (s->fdelim);
+       s->delimend = s->msg_delim + s->edelimlen;

     }
 }
 
     }
 }
 


@@ -876,7 +896,7 @@ m_Eom (m_getfld_state_t s, int c)
 }
 
 
 }
 
 

-static unsigned char *
+static char *

 matchc(int patln, char *pat, int strln, char *str)
 {
        register char *es = str + strln - patln;
 matchc(int patln, char *pat, int strln, char *str)
 {
        register char *es = str + strln - patln;


@@ -895,6 +915,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;

        }
 }
        }
 }