crawl_folders.h: Base header on implementation.

[nmh] / sbr / seq_read.c

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 759dba491f89e6edfa0a8c1fc660b46ca40bd579..20d16ce908c99de3dbfd99d56fa25bea403ac48e 100644 (file)
--- 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
  *            -- initialize sequence information
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the


@@ -8,8 +6,17 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "m_getfld.h"
+#include "seq_read.h"
+#include "ssequal.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
 
 /*
  * static prototypes


@@ -62,9 +69,9 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
 {
     int state;
     char *cp, seqfile[PATH_MAX];
 {
     int state;
     char *cp, seqfile[PATH_MAX];

-    char name[NAMESZ], field[BUFSIZ];
+    char name[NAMESZ], field[NMH_BUFSIZ];

     FILE *fp;
     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
 
     /*
      * If mh_seq == NULL or if *mh_seq == '\0' (the user has defined


@@ -81,37 +88,38 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
        == NULL)
        return NOTOK;
 
        == 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;
     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) {
            case FLD: 
            case FLDPLUS:
                if (state == FLDPLUS) {

-                   cp = getcpy (field);
+                   cp = mh_xstrdup(field);

                    while (state == FLDPLUS) {
                        fieldsz = sizeof 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);
                    }
                        cp = add (field, cp);
                    }

-                   seq_init (mp, getcpy (name), trimcpy (cp));
+                   seq_init (mp, mh_xstrdup(name), trimcpy (cp));

                    free (cp);
                } else {
                    free (cp);
                } else {

-                   seq_init (mp, getcpy (name), trimcpy (field));
+                   seq_init (mp, mh_xstrdup(name), trimcpy (field));

                }
                continue;
 
            case BODY:
                lkfclosedata (fp, seqfile);
                }
                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);
 
            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 */
     }
        }
        break;  /* break from for loop */
     }


@@ -119,7 +127,7 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
 
     if (lockflag) {
        mp->seqhandle = fp;
 
     if (lockflag) {
        mp->seqhandle = fp;

-       mp->seqname = getcpy(seqfile);
+       mp->seqname = mh_xstrdup(seqfile);

     } else {
        lkfclosedata (fp, seqfile);
     }
     } else {
        lkfclosedata (fp, seqfile);
     }


@@ -142,7 +150,7 @@ seq_private (struct msgs *mp)
     char *cp;
     struct node *np;
 
     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) {
     plen = strlen (mp->foldpath) + 1;
 
     for (np = m_defs; np; np = np->n_next) {


@@ -150,7 +158,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) {
                && (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);
            *(cp + j - alen) = '\0';
            if ((i = seq_init (mp, cp, getcpy (np->n_field))) != -1)
                make_seq_private (mp, i);