Remove dead code: FLDEOF and BODYEOF are never set

[mmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index e95ee6a..cb16dea 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <locale.h>
+#include <sysexits.h>
 
 static struct swit switches[] = {
 #define MODESW 0
@@ -112,7 +113,6 @@ get_msgnums(char *folder, char *sequences[])
                                fp)) {
                case FLD:
                case FLDPLUS:
-               case FLDEOF:
                        if (state == FLDPLUS) {
                                cp = getcpy(field);
                                while (state == FLDPLUS) {
@@ -154,13 +154,10 @@ get_msgnums(char *folder, char *sequences[])
                                }
                        }
 
-                       if (state == FLDEOF)
-                               break;
                        continue;
 
                case BODY:
-               case BODYEOF:
-                       adios(NULL, "no blank lines are permitted in %s",
+                       adios(EX_DATAERR, NULL, "no blank lines are permitted in %s",
                                        seqfile);
                        /* fall */
 
@@ -168,7 +165,7 @@ get_msgnums(char *folder, char *sequences[])
                        break;
 
                default:
-                       adios(NULL, "%s is poorly formatted", seqfile);
+                       adios(EX_SOFTWARE, NULL, "%s is poorly formatted", seqfile);
                }
                break;  /* break from for loop */
        }
@@ -256,7 +253,7 @@ check_folders(struct node **first, struct node **last,
        } else {
                fp = fopen(folders, "r");
                if (fp  == NULL) {
-                       adios(NULL, "failed to read %s", folders);
+                       adios(EX_IOERR, NULL, "failed to read %s", folders);
                }
                while (vfgets(fp, &line) == OK) {
                        len = strlen(line) - 1;
@@ -457,28 +454,28 @@ main(int argc, char **argv)
                        switch (smatch(++cp, switches)) {
                        case AMBIGSW:
                                ambigsw(cp, switches);
-                               exit(1);
+                               exit(EX_USAGE);
                        case UNKWNSW:
-                               adios(NULL, "-%s unknown", cp);
+                               adios(EX_USAGE, NULL, "-%s unknown", cp);
 
                        case HELPSW:
                                snprintf(help, sizeof(help),
                                                "%s [switches] [sequences]",
                                                invo_name);
                                print_help(help, switches, 1);
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
                        case VERSIONSW:
                                print_version(invo_name);
-                               exit(0);
+                               exit(argc == 2 ? EX_OK : EX_USAGE);
 
                        case FOLDERSSW:
                                if (!(folders = *argp++) || *folders == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                continue;
                        case MODESW:
                                if (!(invo_name = *argp++) || *invo_name == '-')
-                                       adios(NULL, "missing argument to %s",
+                                       adios(EX_USAGE, NULL, "missing argument to %s",
                                                        argp[-2]);
                                invo_name = mhbasename(invo_name);
                                continue;
@@ -512,7 +509,7 @@ main(int argc, char **argv)
                /* no sequence arguments; use unseen */
                if ((unseen = context_find(usequence))) {
                        if (!*unseen) {
-                               adios(NULL, "profile entry %s set, but empty, and no sequences given", usequence);
+                               adios(EX_CONFIG, NULL, "profile entry %s set, but empty, and no sequences given", usequence);
                        }
                } else {
                        unseen = seq_unseen;  /* use default */
@@ -526,7 +523,7 @@ main(int argc, char **argv)
 
        folder = doit(context_find(curfolder), folders, sequences);
        if (folder == NULL) {
-               exit(0);
+               exit(EX_OK);
                return 1;
        }