X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0a032eea07f6d77ac6ea4d5a39c9491c34358058..827facc0fe3f6f0ef2a9e81917d2eb29fac209aa:/sbr/seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 8a68c1ad..c0043350 100644
--- 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
@@ -7,8 +6,14 @@
  * 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"
 
 /*
  * static prototypes
@@ -61,9 +66,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 +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 */
     }