X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a4f7db8d70e4a1f285fb8345d3c9173b4a0cbe17..06efa573c7894caa4e5aa1ac7c64bd10ea25928b:/sbr/seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 44e25799..9a4b9131 100644
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -1,6 +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
@@ -10,12 +8,13 @@
 
 #include <h/mh.h>
 #include <h/utils.h>
+#include "lock_file.h"
 
 /*
  * static prototypes
  */
 static int seq_init (struct msgs *, char *, char *);
-static int seq_public (struct msgs *, int);
+static int seq_public (struct msgs *, int, int *);
 static void seq_private (struct msgs *);
 
 
@@ -28,6 +27,8 @@ static void seq_private (struct msgs *);
 int
 seq_read (struct msgs *mp, int lockflag)
 {
+    int failed_to_lock = 0;
+
     /*
      * Initialize the list of sequence names.  Go ahead and
      * add the "cur" sequence to the list of sequences.
@@ -40,11 +41,8 @@ seq_read (struct msgs *mp, int lockflag)
 	return OK;
 
     /* Initialize the public sequences */
-    if (seq_public (mp, lockflag) == NOTOK) {
-	if (errno == EACCES  ||  errno == EAGAIN  ||  errno == EWOULDBLOCK) {
-	    /* Failed to lock sequence file. */
-	    return NOTOK;
-        }
+    if (seq_public (mp, lockflag, &failed_to_lock) == NOTOK) {
+	if (failed_to_lock) return NOTOK;
     }
 
     /* Initialize the private sequences */
@@ -59,13 +57,13 @@ seq_read (struct msgs *mp, int lockflag)
  */
 
 static int
-seq_public (struct msgs *mp, int lockflag)
+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
@@ -78,40 +76,42 @@ seq_public (struct msgs *mp, int lockflag)
     /* get filename of sequence file */
     snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 
-    if ((fp = lkfopendata (seqfile, lockflag ? "r+" : "r")) == NULL)
+    if ((fp = lkfopendata (seqfile, lockflag ? "r+" : "r", 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 = getcpy (field);
+		    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, getcpy (name), trimcpy (cp));
+		    seq_init (mp, mh_xstrdup(name), trimcpy (cp));
 		    free (cp);
 		} else {
-		    seq_init (mp, getcpy (name), trimcpy (field));
+		    seq_init (mp, mh_xstrdup(name), trimcpy (field));
 		}
 		continue;
 
 	    case BODY:
 	    	lkfclosedata (fp, seqfile);
-		adios (NULL, "no blank lines are permitted in %s", seqfile);
-		/* fall */
+		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 */
     }
@@ -119,7 +119,7 @@ seq_public (struct msgs *mp, int lockflag)
 
     if (lockflag) {
 	mp->seqhandle = fp;
-	mp->seqname = getcpy(seqfile);
+	mp->seqname = mh_xstrdup(seqfile);
     } else {
 	lkfclosedata (fp, seqfile);
     }
@@ -142,7 +142,7 @@ seq_private (struct msgs *mp)
     char *cp;
     struct node *np;
 
-    alen = strlen ("atr-");
+    alen = LEN("atr-");
     plen = strlen (mp->foldpath) + 1;
 
     for (np = m_defs; np; np = np->n_next) {
@@ -150,7 +150,7 @@ seq_private (struct msgs *mp)
 		&& (j = strlen (np->n_name) - plen) > alen
 		&& *(np->n_name + j) == '-'
 		&& strcmp (mp->foldpath, np->n_name + j + 1) == 0) {
-	    cp = getcpy (np->n_name + alen);
+	    cp = mh_xstrdup(np->n_name + alen);
 	    *(cp + j - alen) = '\0';
 	    if ((i = seq_init (mp, cp, getcpy (np->n_field))) != -1)
 		make_seq_private (mp, i);
@@ -186,7 +186,7 @@ seq_init (struct msgs *mp, char *name, char *field)
      * Search for this sequence name to see if we've seen
      * it already.  If we've seen this sequence before,
      * then clear the bit for this sequence from all the
-     * mesages in this folder.
+     * messages in this folder.
      */
     for (i = 0; i < svector_size (mp->msgattrs); i++) {
 	if (!strcmp (svector_at (mp->msgattrs, i), name)) {