Removed all traces of m_getfld() FLDEOF and BODYEOF states.

They were never set by m_getfld(), so all caller code that
supported them was completely unexercised.

diff --git a/h/mh.h b/h/mh.h
index fb05fa7..07f6508 100644 (file)
--- a/h/mh.h
+++ b/h/mh.h
@@ -237,9 +237,7 @@ struct msgs {
 #define FMTERR  (-3)           /* Message Format error             */
 #define FLD      0             /* Field returned                   */
 #define FLDPLUS  1             /* Field returned with more to come */
 #define FMTERR  (-3)           /* Message Format error             */
 #define FLD      0             /* Field returned                   */
 #define FLDPLUS  1             /* Field returned with more to come */

-#define FLDEOF   2             /* Field returned ending at eom     */

 #define BODY     3             /* Body  returned with more to come */
 #define BODY     3             /* Body  returned with more to come */

-#define BODYEOF  4             /* Body  returned ending at eom     */

 #define FILEEOF  5             /* Reached end of input file        */
 
 /*
 #define FILEEOF  5             /* Reached end of input file        */
 
 /*

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 05b9e95..fe4ee5d 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -426,8 +426,6 @@ m_getfld (int state, unsigned char name[NAMESZ], unsigned char *buf,
     }
 
     switch (state) {
     }
 
     switch (state) {

-       case FLDEOF:
-       case BODYEOF:

        case FLD:
            if (c == '\n' || c == '-') {
                /* we hit the header/body separator */
        case FLD:
            if (c == '\n' || c == '-') {
                /* we hit the header/body separator */

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 0efc9a5..b8b1b35 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -63,7 +63,6 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
        switch (state = m_getfld (state, name, field, &fieldsz, ib)) {
            case FLD:
            case FLDPLUS:
        switch (state = m_getfld (state, name, field, &fieldsz, ib)) {
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                np = (struct node *) mh_xmalloc (sizeof(*np));
                *npp = np;
                *(npp = &np->n_next) = NULL;
                np = (struct node *) mh_xmalloc (sizeof(*np));
                *npp = np;
                *(npp = &np->n_next) = NULL;


@@ -91,12 +90,9 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
                        *ps->procnaddr = np->n_field;
                        break;
                    }
                        *ps->procnaddr = np->n_field;
                        break;
                    }

-               if (state == FLDEOF)
-                   break;

                continue;
 
            case BODY:
                continue;
 
            case BODY:

-           case BODYEOF:

                adios (NULL, "no blank lines are permitted in %s", file);
 
            case FILEEOF:
                adios (NULL, "no blank lines are permitted in %s", file);
 
            case FILEEOF:

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 3cf8ad8..08c6744 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -81,7 +81,6 @@ seq_public (struct msgs *mp)
        switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
            case FLD: 
            case FLDPLUS:
        switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
            case FLD: 
            case FLDPLUS:

-           case FLDEOF: 

                if (state == FLDPLUS) {
                    cp = getcpy (field);
                    while (state == FLDPLUS) {
                if (state == FLDPLUS) {
                    cp = getcpy (field);
                    while (state == FLDPLUS) {


@@ -94,12 +93,9 @@ seq_public (struct msgs *mp)
                } else {
                    seq_init (mp, getcpy (name), trimcpy (field));
                }
                } else {
                    seq_init (mp, getcpy (name), trimcpy (field));
                }

-               if (state == FLDEOF)
-                   break;

                continue;
 
            case BODY: 
                continue;
 
            case BODY: 

-           case BODYEOF: 

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

diff --git a/uip/distsbr.c b/uip/distsbr.c
index bbaeaf5..e2aaab0 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -51,7 +51,6 @@ distout (char *drft, char *msgnam, char *backup)
        switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
            case FLD: 
            case FLDPLUS: 
        switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
            case FLD: 
            case FLDPLUS: 

-           case FLDEOF: 

                if (uprf (name, "distribute-"))
                    snprintf (name, sizeof(name), "%s%s", "Resent", &name[10]);
                if (uprf (name, "distribution-"))
                if (uprf (name, "distribute-"))
                    snprintf (name, sizeof(name), "%s%s", "Resent", &name[10]);
                if (uprf (name, "distribution-"))


@@ -70,12 +69,9 @@ distout (char *drft, char *msgnam, char *backup)
                    resent = add (buffer, resent);
                    fputs (buffer, ofp);
                }
                    resent = add (buffer, resent);
                    fputs (buffer, ofp);
                }

-               if (state == FLDEOF)
-                   goto process;

                break;
 
            case BODY: 
                break;
 
            case BODY: 

-           case BODYEOF: 

                for (dp = buffer; *dp; dp++)
                    if (!isspace (*dp)) {
                        advise (NULL, BADTXT, "draft");
                for (dp = buffer; *dp; dp++)
                    if (!isspace (*dp)) {
                        advise (NULL, BADTXT, "draft");


@@ -157,7 +153,6 @@ ready_msg (char *msgnam)
        switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
            case FLD: 
            case FLDPLUS: 
        switch (state = m_getfld (state, name, buffer, &buffersz, ifp)) {
            case FLD: 
            case FLDPLUS: 

-           case FLDEOF: 

                if (uprf (name, "resent"))
                    fprintf (ofp, "Prev-");
                fprintf (ofp, "%s: %s", name, buffer);
                if (uprf (name, "resent"))
                    fprintf (ofp, "Prev-");
                fprintf (ofp, "%s: %s", name, buffer);


@@ -166,12 +161,9 @@ ready_msg (char *msgnam)
                    state = m_getfld (state, name, buffer, &buffersz, ifp);
                    fputs (buffer, ofp);
                }
                    state = m_getfld (state, name, buffer, &buffersz, ifp);
                    fputs (buffer, ofp);
                }

-               if (state == FLDEOF)
-                   goto process;

                break;
 
            case BODY: 
                break;
 
            case BODY: 

-           case BODYEOF: 

                fclose (ofp);
 
                 cp = m_mktemp2(NULL, "dist", &txtfd, NULL);
                fclose (ofp);
 
                 cp = m_mktemp2(NULL, "dist", &txtfd, NULL);

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index c7164b3..12479a5 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -167,7 +167,6 @@ build_mime (char *infile, int directives)
        switch (state = m_getfld (state, name, buf, &bufsz, in)) {
        case FLD:
        case FLDPLUS:
        switch (state = m_getfld (state, name, buf, &bufsz, in)) {
        case FLD:
        case FLDPLUS:

-       case FLDEOF:

            compnum++;
 
            /* abort if draft has Mime-Version header field */
            compnum++;
 
            /* abort if draft has Mime-Version header field */


@@ -203,16 +202,13 @@ build_mime (char *infile, int directives)
 
 finish_field:
            /* if this wasn't the last header field, then continue */
 
 finish_field:
            /* if this wasn't the last header field, then continue */

-           if (state != FLDEOF)
-               continue;
-           /* else fall... */
+           continue;

 
        case FILEEOF:
            adios (NULL, "draft has empty body -- no directives!");
            /* NOTREACHED */
 
        case BODY:
 
        case FILEEOF:
            adios (NULL, "draft has empty body -- no directives!");
            /* NOTREACHED */
 
        case BODY:

-       case BODYEOF:

            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
            break;
 
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
            break;
 

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 59e2791..5970a9d 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -388,7 +388,6 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
            case FLD:
            case FLDPLUS:
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                strncpy (mapname, name, namelen);
                if (state != FLDPLUS)
                    cp = buf;
                strncpy (mapname, name, namelen);
                if (state != FLDPLUS)
                    cp = buf;


@@ -412,12 +411,9 @@ find_cache_aux2 (char *mapfile, char *id, char *mapname, int namelen)
                    lkfclose (fp, mapfile);
                    return OK;
                }
                    lkfclose (fp, mapfile);
                    return OK;
                }

-               if (state != FLDEOF)
-                   continue;
-               /* else fall... */
+               continue;

 
            case BODY:
 
            case BODY:

-           case BODYEOF:

            case FILEEOF:
            default:
                break;
            case FILEEOF:
            default:
                break;

diff --git a/uip/mhparse.c b/uip/mhparse.c
index ea5400e..ad499d0 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -280,7 +280,6 @@ get_content (FILE *in, char *file, int toplevel)
        switch (state = m_getfld (state, name, buf, &bufsz, in)) {
        case FLD:
        case FLDPLUS:
        switch (state = m_getfld (state, name, buf, &bufsz, in)) {
        case FLD:
        case FLDPLUS:

-       case FLDEOF:

            compnum++;
 
            /* get copies of the buffers */
            compnum++;
 
            /* get copies of the buffers */


@@ -297,15 +296,11 @@ get_content (FILE *in, char *file, int toplevel)
            /* Now add the header data to the list */
            add_header (ct, np, vp);
 
            /* Now add the header data to the list */
            add_header (ct, np, vp);
 

-           /* continue, if this isn't the last header field */
-           if (state != FLDEOF) {
-               ct->c_begin = ftell (in) + 1;
-               continue;
-           }
-           /* else fall... */
+           /* continue, to see if this isn't the last header field */
+           ct->c_begin = ftell (in) + 1;
+           continue;

 
        case BODY:
 
        case BODY:

-       case BODYEOF:

            ct->c_begin = ftell (in) - strlen (buf);
            break;
 
            ct->c_begin = ftell (in) - strlen (buf);
            break;
 

diff --git a/uip/msh.c b/uip/msh.c
index 36286e0..cc2d5ef 100644 (file)
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -1009,7 +1009,6 @@ readid (int msgnum)
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, zp)) {
            case FLD: 
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, zp)) {
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
                if (!mh_strcasecmp (name, BBoard_ID)) {
                    bp = getcpy (buf);
            case FLDPLUS: 
                if (!mh_strcasecmp (name, BBoard_ID)) {
                    bp = getcpy (buf);


@@ -1028,8 +1027,7 @@ readid (int msgnum)
                while (state == FLDPLUS)
                    bufsz = sizeof buf;
                    state = m_getfld (state, name, buf, &bufsz, zp);
                while (state == FLDPLUS)
                    bufsz = sizeof buf;
                    state = m_getfld (state, name, buf, &bufsz, zp);

-               if (state != FLDEOF)
-                   continue;
+               continue;

 
            default: 
                return 0;
 
            default: 
                return 0;

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index c2a8a3c..cdda3c9 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -2440,7 +2440,6 @@ is_nontext (int msgnum)
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
        case FLD:
        case FLDPLUS:
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
        case FLD:
        case FLDPLUS:

-       case FLDEOF:

            /*
             * Check Content-Type field
             */
            /*
             * Check Content-Type field
             */


@@ -2751,7 +2750,6 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, zp)) {
            case FLD: 
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, zp)) {
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
                if (!mh_strcasecmp (name, datesw)) {
                    bp = getcpy (buf);
            case FLDPLUS: 
                if (!mh_strcasecmp (name, datesw)) {
                    bp = getcpy (buf);


@@ -2792,7 +2790,6 @@ get_fields (char *datesw, char *subjsw, int msgnum, struct Msg *msgp)
                continue;
 
            case BODY: 
                continue;
 
            case BODY: 

-           case BODYEOF: 

            case FILEEOF: 
                break;
 
            case FILEEOF: 
                break;
 

diff --git a/uip/new.c b/uip/new.c
index 198207a..7bef56a 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -109,7 +109,6 @@ get_msgnums(char *folder, char *sequences[])
        switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
             case FLD:
             case FLDPLUS:
        switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
             case FLD:
             case FLDPLUS:

-            case FLDEOF:

                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {
                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {


@@ -149,12 +148,9 @@ get_msgnums(char *folder, char *sequences[])
                     }
                 }
 
                     }
                 }
 

-                if (state == FLDEOF)
-                    break;

                 continue;
 
             case BODY:
                 continue;
 
             case BODY:

-            case BODYEOF:

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

diff --git a/uip/picksbr.c b/uip/picksbr.c
index d03e72b..5fa7318 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -950,7 +950,6 @@ plist
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
            case FLD: 
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
                if (bp != NULL)
                    free (bp), bp = NULL;
            case FLDPLUS: 
                if (bp != NULL)
                    free (bp), bp = NULL;


@@ -962,11 +961,9 @@ plist
                }
                if (!mh_strcasecmp (name, n->n_datef))
                    break;
                }
                if (!mh_strcasecmp (name, n->n_datef))
                    break;

-               if (state != FLDEOF)
-                   continue;
+               continue;

 
            case BODY: 
 
            case BODY: 

-           case BODYEOF: 

            case FILEEOF: 
            case LENERR: 
            case FMTERR: 
            case FILEEOF: 
            case LENERR: 
            case FMTERR: 

diff --git a/uip/post.c b/uip/post.c
index c81f0fc..10ebd2a 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -582,7 +582,6 @@ main (int argc, char **argv)
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, in)) {
            case FLD: 
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, name, buf, &bufsz, in)) {
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
                compnum++;
                cp = add (buf, NULL);
            case FLDPLUS: 
                compnum++;
                cp = add (buf, NULL);


@@ -593,13 +592,9 @@ main (int argc, char **argv)
                }
                putfmt (name, cp, out);
                free (cp);
                }
                putfmt (name, cp, out);
                free (cp);

-               if (state != FLDEOF)
-                   continue;
-               finish_headers (out);
-               break;
+               continue;

 
            case BODY: 
 
            case BODY: 

-           case BODYEOF: 

                finish_headers (out);
                if (whomsw)
                    break;
                finish_headers (out);
                if (whomsw)
                    break;

diff --git a/uip/prompter.c b/uip/prompter.c
index 6b540db..a62f415 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -212,7 +212,6 @@ main (int argc, char **argv)
        int fieldsz = sizeof field;
        switch (state = m_getfld (state, name, field, &fieldsz, in)) {
            case FLD: 
        int fieldsz = sizeof field;
        switch (state = m_getfld (state, name, field, &fieldsz, in)) {
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
                /*
                 * Check if the value of field contains anything
            case FLDPLUS: 
                /*
                 * Check if the value of field contains anything


@@ -258,17 +257,9 @@ abort:
                    }
                }
 
                    }
                }
 

-               if (state == FLDEOF) {  /* moby hack */
-                   fprintf (out, "--------\n");
-                   printf ("--------\n");
-                   if (!body)
-                       break;
-                   goto no_body;
-               }

                continue;
 
            case BODY: 
                continue;
 
            case BODY: 

-           case BODYEOF:

            case FILEEOF: 
                if (!body)
                    break;
            case FILEEOF: 
                if (!body)
                    break;


@@ -301,7 +292,7 @@ abort:
                    else
                        printf ("\n--------Enter additional text\n\n");
                }
                    else
                        printf ("\n--------Enter additional text\n\n");
                }

-no_body:
+

                fflush (stdout);
                for (;;) {
                    getln (field, sizeof(field));
                fflush (stdout);
                for (;;) {
                    getln (field, sizeof(field));

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index a7dc0ea..125bc02 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -607,7 +607,6 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
        switch (state = m_getfld (state, name, buffer, &bufsz, in)) {
            case FLD:
            case FLDPLUS:
        switch (state = m_getfld (state, name, buffer, &bufsz, in)) {
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                compnum++;
 
                /*
                compnum++;
 
                /*


@@ -658,14 +657,10 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
                    }
                }
 
                    }
                }
 

-               if (state != FLDEOF) {
-                   start = ftell (in) + 1;
-                   continue;
-               }
-               /* else fall... */
+               start = ftell (in) + 1;
+               continue;

 
           case BODY:
 
           case BODY:

-          case BODYEOF:

           case FILEEOF:
                break;
 
           case FILEEOF:
                break;
 

diff --git a/uip/show.c b/uip/show.c
index ad75046..dade251 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -357,7 +357,6 @@ is_nontext (char *msgnam)
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
        case FLD:
        case FLDPLUS:
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
        case FLD:
        case FLDPLUS:

-       case FLDEOF:

            /*
             * Check Content-Type field
             */
            /*
             * Check Content-Type field
             */

diff --git a/uip/slocal.c b/uip/slocal.c
index 5eadea4..a665d0a 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -743,7 +743,6 @@ parse (int fd)
        int fieldsz = sizeof field;
        switch (state = m_getfld (state, name, field, &fieldsz, in)) {
            case FLD: 
        int fieldsz = sizeof field;
        switch (state = m_getfld (state, name, field, &fieldsz, in)) {
            case FLD: 

-           case FLDEOF: 

            case FLDPLUS: 
                lp = add (field, NULL);
                while (state == FLDPLUS) {
            case FLDPLUS: 
                lp = add (field, NULL);
                while (state == FLDPLUS) {


@@ -777,12 +776,9 @@ parse (int fd)
                    p++, i++;
                    p->p_name = NULL;
                }
                    p++, i++;
                    p->p_name = NULL;
                }

-               if (state != FLDEOF)
-                   continue;
-               break;
+               continue;

 
            case BODY: 
 
            case BODY: 

-           case BODYEOF: 

            case FILEEOF: 
                break;
 
            case FILEEOF: 
                break;
 


@@ -1431,7 +1427,6 @@ suppress_duplicates (int fd, char *file)
        switch (state) {
            case FLD:
            case FLDPLUS:
        switch (state) {
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                /* Search for the message ID */
                if (mh_strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS) {
                /* Search for the message ID */
                if (mh_strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS) {


@@ -1492,7 +1487,6 @@ suppress_duplicates (int fd, char *file)
                break;
 
           case BODY:
                break;
 
           case BODY:

-          case BODYEOF:

           case FILEEOF:
                break;
 
           case FILEEOF:
                break;
 

diff --git a/uip/sortm.c b/uip/sortm.c
index 95c76b5..b4e6d56 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -374,7 +374,6 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, nam, buf, &bufsz, in)) {
        case FLD:
        int bufsz = sizeof buf;
        switch (state = m_getfld (state, nam, buf, &bufsz, in)) {
        case FLD:

-       case FLDEOF:

        case FLDPLUS:
            compnum++;
            if (!mh_strcasecmp (nam, datesw)) {
        case FLDPLUS:
            compnum++;
            if (!mh_strcasecmp (nam, datesw)) {


@@ -405,7 +404,6 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
            continue;
 
        case BODY:
            continue;
 
        case BODY:

-       case BODYEOF:

        case FILEEOF:
            break;
 
        case FILEEOF:
            break;
 

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index a56446f..66cf41f 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -946,7 +946,6 @@ check_draft (char *msgnam)
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
            case FLD:
            case FLDPLUS:
        switch (state = m_getfld (state, name, buf, &bufsz, fp)) {
            case FLD:
            case FLDPLUS:

-           case FLDEOF:

                /*
                 * If draft already contains any of the
                 * Content-XXX fields, then assume it already
                /*
                 * If draft already contains any of the
                 * Content-XXX fields, then assume it already