fmt_rfc2047.c: Move interface to own file.

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 500ea0b90f9b576d2e0d624c8b832987596957f5..c00433508602b5de2fa5874ea2002659f1b8dbdf 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -6,8 +6,13 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "trimcpy.h"
+#include "getcpy.h"
+#include "m_atoi.h"
+#include "brkstring.h"
+#include "error.h"
+#include "h/utils.h"
 #include "lock_file.h"
 
 /*
@@ -63,7 +68,7 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
     char *cp, seqfile[PATH_MAX];
     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 +85,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));
@@ -102,15 +108,15 @@ 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 */
+               die("no blank lines are permitted in %s", seqfile);
+               break;
 
            case FILEEOF:
                break;
 
            default: 
                lkfclosedata (fp, seqfile);
-               adios (NULL, "%s is poorly formatted", seqfile);
+               die("%s is poorly formatted", seqfile);
        }
        break;  /* break from for loop */
     }