X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..c6bf562d9e823f02fb4a9e6dfb89bf93a0e9d0ab:/sbr/seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index b1dc3a5a..985c61e8 100644
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -3,14 +3,13 @@
  * seq_read.c -- read the .mh_sequence file and
  *            -- initialize sequence information
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 /*
  * static prototypes
@@ -22,17 +21,13 @@ static void seq_private (struct msgs *);
 
 /*
  * Get the sequence information for this folder from
- * .mh_sequence (or equivalent specified in .mh_profile)
+ * .mh_sequences (or equivalent specified in .mh_profile)
  * or context file (for private sequences).
  */
 
 void
 seq_read (struct msgs *mp)
 {
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-	adios (NULL, "oops, context hasn't been read yet");
-
     /*
      * Initialize the list of sequence names.  Go ahead and
      * add the "cur" sequence to the list of sequences.
@@ -77,7 +72,7 @@ seq_public (struct msgs *mp)
     /* get filename of sequence file */
     snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 
-    if ((fp = fopen (seqfile, "r")) == NULL)
+    if ((fp = lkfopen (seqfile, "r")) == NULL)
 	return;
 
     /* Use m_getfld to scan sequence file */
@@ -115,7 +110,7 @@ seq_public (struct msgs *mp)
 	break;	/* break from for loop */
     }
 
-    fclose (fp);
+    lkfclose (fp, seqfile);
 }
 
 
@@ -163,7 +158,8 @@ seq_private (struct msgs *mp)
 static int
 seq_init (struct msgs *mp, char *name, char *field)
 {
-    int i, j, k, is_current;
+    unsigned int i;
+    int j, k, is_current;
     char *cp, **ap;
 
     /*