A bug fix and an enhancement to mhfixmsg based on patches

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index a807ef7d6169b0b000c57535c163590f8e190fd5..831efd285454ac8714e2d5c911f713fa4356053a 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,7 +26,7 @@ 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
 {
     /*
      * Initialize the list of sequence names.  Go ahead and


@@ -41,7 +41,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 +53,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 +73,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 +96,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 +105,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);
+    }

 }
 
 
 }
 
 


@@ -184,6 +191,7 @@ seq_init (struct msgs *mp, char *name, char *field)
 
     /* Return error, if too many sequences */
     if (i >= NUMATTRS) {
 
     /* Return error, if too many sequences */
     if (i >= NUMATTRS) {

+       admonish (NULL, "Too many sequences, sequence %s ignored", name);

        free (name);
        free (field);
        return -1;
        free (name);
        free (field);
        return -1;