Moved all file static data in m_getfld.c into the

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 10854dc98ea5a4ec800248152cd41d6163520479..7bef56ace35b7d2a2c0fc6617b6668352b22c15b 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -105,15 +105,15 @@ get_msgnums(char *folder, char *sequences[])
 
     /* copied from seq_read.c:seq_public */
     for (state = FLD;;) {
-        switch (state = m_getfld (state, name, field, sizeof(field), fp)) {
+       int fieldsz = sizeof field;
+       switch (state = m_getfld (state, name, field, &fieldsz, fp)) {
             case FLD:
             case FLDPLUS:
-            case FLDEOF:
                 if (state == FLDPLUS) {
                     cp = getcpy (field);
                     while (state == FLDPLUS) {
-                        state = m_getfld (state, name, field,
-                                          sizeof(field), fp);
+                       fieldsz = sizeof field;
+                       state = m_getfld (state, name, field, &fieldsz, fp);
                         cp = add (field, cp);
                     }
 
@@ -148,12 +148,9 @@ get_msgnums(char *folder, char *sequences[])
                     }
                 }
 
-                if (state == FLDEOF)
-                    break;
                 continue;
 
             case BODY:
-            case BODYEOF:
                 adios (NULL, "no blank lines are permitted in %s", seqfile);
                 /* fall */