Be sure that mhfixmsg returns a status of non-zero if

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index a807ef7d6169b0b000c57535c163590f8e190fd5..4b9e815dd001fb3a8eb29f980e0c797b112239bc 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -15,7 +15,7 @@
  * static prototypes
  */
 static int seq_init (struct msgs *, char *, char *);
  * static prototypes
  */
 static int seq_init (struct msgs *, char *, char *);

-static void seq_public (struct msgs *);
+static void seq_public (struct msgs *, int);

 static void seq_private (struct msgs *);
 
 
 static void seq_private (struct msgs *);
 
 


@@ -26,14 +26,13 @@ static void seq_private (struct msgs *);
  */
 
 void
  */
 
 void

-seq_read (struct msgs *mp)
+seq_read (struct msgs *mp, int lockflag)

 {
     /*
      * Initialize the list of sequence names.  Go ahead and
      * add the "cur" sequence to the list of sequences.
      */
 {
     /*
      * Initialize the list of sequence names.  Go ahead and
      * add the "cur" sequence to the list of sequences.
      */

-    mp->msgattrs[0] = getcpy (current);
-    mp->msgattrs[1] = NULL;
+    svector_push_back (mp->msgattrs, getcpy (current));

     make_all_public (mp);      /* initially, make all public */
 
     /* If folder is empty, don't scan for sequence information */
     make_all_public (mp);      /* initially, make all public */
 
     /* If folder is empty, don't scan for sequence information */


@@ -41,7 +40,7 @@ seq_read (struct msgs *mp)
        return;
 
     /* Initialize the public sequences */
        return;
 
     /* Initialize the public sequences */

-    seq_public (mp);
+    seq_public (mp, lockflag);

 
     /* Initialize the private sequences */
     seq_private (mp);
 
     /* Initialize the private sequences */
     seq_private (mp);


@@ -53,7 +52,7 @@ seq_read (struct msgs *mp)
  */
 
 static void
  */
 
 static void

-seq_public (struct msgs *mp)
+seq_public (struct msgs *mp, int lockflag)

 {
     int state;
     char *cp, seqfile[PATH_MAX];
 {
     int state;
     char *cp, seqfile[PATH_MAX];


@@ -73,7 +72,7 @@ seq_public (struct msgs *mp)
     /* get filename of sequence file */
     snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 
     /* get filename of sequence file */
     snprintf (seqfile, sizeof(seqfile), "%s/%s", mp->foldpath, mh_seq);
 

-    if ((fp = lkfopen (seqfile, "r")) == NULL)
+    if ((fp = lkfopendata (seqfile, lockflag ? "r+" : "r")) == NULL)

        return;
 
     /* Use m_getfld to scan sequence file */
        return;
 
     /* Use m_getfld to scan sequence file */


@@ -96,7 +95,8 @@ seq_public (struct msgs *mp)
                }
                continue;
 
                }
                continue;
 

-           case BODY: 
+           case BODY:
+               lkfclosedata (fp, seqfile);

                adios (NULL, "no blank lines are permitted in %s", seqfile);
                /* fall */
 
                adios (NULL, "no blank lines are permitted in %s", seqfile);
                /* fall */
 


@@ -104,13 +104,19 @@ seq_public (struct msgs *mp)
                break;
 
            default: 
                break;
 
            default: 

+               lkfclosedata (fp, seqfile);

                adios (NULL, "%s is poorly formatted", seqfile);
        }
        break;  /* break from for loop */
     }
     m_getfld_state_destroy (&gstate);
 
                adios (NULL, "%s is poorly formatted", seqfile);
        }
        break;  /* break from for loop */
     }
     m_getfld_state_destroy (&gstate);
 

-    lkfclose (fp, seqfile);
+    if (lockflag) {
+       mp->seqhandle = fp;
+       mp->seqname = getcpy(seqfile);
+    } else {
+       lkfclosedata (fp, seqfile);
+    }

 }
 
 
 }
 
 


@@ -174,30 +180,22 @@ seq_init (struct msgs *mp, char *name, char *field)
      * then clear the bit for this sequence from all the
      * mesages in this folder.
      */
      * then clear the bit for this sequence from all the
      * mesages in this folder.
      */

-    for (i = 0; mp->msgattrs[i]; i++) {
-       if (!strcmp (mp->msgattrs[i], name)) {
+    for (i = 0; i < svector_size (mp->msgattrs); i++) {
+       if (!strcmp (svector_at (mp->msgattrs, i), name)) {

            for (j = mp->lowmsg; j <= mp->hghmsg; j++)
                clear_sequence (mp, i, j);
            break;
        }
     }
 
            for (j = mp->lowmsg; j <= mp->hghmsg; j++)
                clear_sequence (mp, i, j);
            break;
        }
     }
 

-    /* Return error, if too many sequences */
-    if (i >= NUMATTRS) {
-       free (name);
-       free (field);
-       return -1;
-    }
-

     /*
      * If we've already seen this sequence name, just free the
      * name string.  Else add it to the list of sequence names.
      */
     /*
      * If we've already seen this sequence name, just free the
      * name string.  Else add it to the list of sequence names.
      */

-    if (mp->msgattrs[i]) {
+    if (svector_at (mp->msgattrs, i)) {

        free (name);
     } else {
        free (name);
     } else {

-       mp->msgattrs[i] = name;
-       mp->msgattrs[i + 1] = NULL;
+       svector_push_back (mp->msgattrs, name);

     }
 
     /*
     }
 
     /*