Fix invalid pointer arithmetic.

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 8a68c1adcb28e96115d73f69513847faa1829b93..39192605ffd3544b846e1388f2c0cfd6a1e7cdd7 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -1,5 +1,4 @@
-/*
- * seq_read.c -- read the .mh_sequence file and
+/* seq_read.c -- read the .mh_sequence file and
  *            -- initialize sequence information
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
@@ -9,6 +8,7 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "lock_file.h"
 
 /*
  * static prototypes
@@ -61,9 +61,9 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
 {
     int state;
     char *cp, seqfile[PATH_MAX];
-    char name[NAMESZ], field[BUFSIZ];
+    char name[NAMESZ], field[NMH_BUFSIZ];
     FILE *fp;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     /*
      * If mh_seq == NULL or if *mh_seq == '\0' (the user has defined
@@ -80,17 +80,18 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
        == NULL)
        return NOTOK;
 
-    /* Use m_getfld to scan sequence file */
+    /* Use m_getfld2 to scan sequence file */
+    gstate = m_getfld_state_init(fp);
     for (;;) {
        int fieldsz = sizeof field;
-       switch (state = m_getfld (&gstate, name, field, &fieldsz, fp)) {
+       switch (state = m_getfld2(&gstate, name, field, &fieldsz)) {
            case FLD: 
            case FLDPLUS:
                if (state == FLDPLUS) {
                    cp = mh_xstrdup(field);
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
-                       state = m_getfld (&gstate, name, field, &fieldsz, fp);
+                       state = m_getfld2(&gstate, name, field, &fieldsz);
                        cp = add (field, cp);
                    }
                    seq_init (mp, mh_xstrdup(name), trimcpy (cp));
@@ -103,7 +104,7 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
            case BODY:
                lkfclosedata (fp, seqfile);
                adios (NULL, "no blank lines are permitted in %s", seqfile);
-               /* FALLTHRU */
+               break;
 
            case FILEEOF:
                break;