X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/adc0a3232c43033729dbc036f0757bddfba463bd..fc8a48c33835906623cb10ee129fc70a72271e02:/uip/show.c

diff --git a/uip/show.c b/uip/show.c
index d04835e6..f513ebd5 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -11,45 +11,33 @@
 #include <h/mime.h>
 #include <h/utils.h>
 
-static struct swit switches[] = {
-#define CHECKMIMESW          0
-    { "checkmime", 0 },
-#define NOCHECKMIMESW        1
-    { "nocheckmime", 0 },
-#define	HEADSW               2
-    { "header", 0 },
-#define	NHEADSW              3
-    { "noheader", 0 },
-#define	FORMSW               4
-    { "form formfile", 0 },
-#define	PROGSW               5
-    { "moreproc program", 0 },
-#define	NPROGSW              6
-    { "nomoreproc", 0 },
-#define	LENSW                7
-    { "length lines", 0 },
-#define	WIDTHSW              8
-    { "width columns", 0 },
-#define	SHOWSW               9
-    { "showproc program", 0 },
-#define SHOWMIMESW          10
-    { "showmimeproc program", 0 },
-#define	NSHOWSW             11
-    { "noshowproc", 0 },
-#define	DRFTSW              12
-    { "draft", 0 },
-#define	FILESW              13
-    { "file file", -4 },		/* interface from showfile */
-#define FMTPROCSW           14
-    { "fmtproc program", 0 },
-#define NFMTPROCSW          15
-    { "nofmtproc", 0 },
-#define VERSIONSW           16
-    { "version", 0 },
-#define	HELPSW              17
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define SHOW_SWITCHES \
+    X("checkmime", 0, CHECKMIMESW) \
+    X("nocheckmime", 0, NOCHECKMIMESW) \
+    X("header", 0, HEADSW) \
+    X("noheader", 0, NHEADSW) \
+    X("form formfile", 0, FORMSW) \
+    X("moreproc program", 0, PROGSW) \
+    X("nomoreproc", 0, NPROGSW) \
+    X("length lines", 0, LENSW) \
+    X("width columns", 0, WIDTHSW) \
+    X("showproc program", 0, SHOWSW) \
+    X("showmimeproc program", 0, SHOWMIMESW) \
+    X("noshowproc", 0, NSHOWSW) \
+    X("draft", 0, DRFTSW) \
+    X("file file", -4, FILESW) /* interface from showfile */ \
+    X("fmtproc program", 0, FMTPROCSW) \
+    X("nofmtproc", 0, NFMTPROCSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SHOW);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SHOW, switches);
+#undef X
 
 /*
  * static prototypes
@@ -344,19 +332,17 @@ static int
 is_nontext (char *msgnam)
 {
     int	result, state;
-    unsigned char *bp, *dp;
-    char *cp;
+    char *bp, *dp, *cp;
     char buf[BUFSIZ], name[NAMESZ];
     FILE *fp;
-    m_getfld_state_t gstate;
+    m_getfld_state_t gstate = 0;
 
     if ((fp = fopen (msgnam, "r")) == NULL)
 	return 0;
 
-    m_getfld_state_init (&gstate);
     for (;;) {
 	int bufsz = sizeof buf;
-	switch (state = m_getfld (gstate, name, buf, &bufsz, fp)) {
+	switch (state = m_getfld (&gstate, name, buf, &bufsz, fp)) {
 	case FLD:
 	case FLDPLUS:
 	    /*
@@ -369,14 +355,14 @@ is_nontext (char *msgnam)
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
-		    state = m_getfld (gstate, name, buf, &bufsz, fp);
+		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
 		    cp = add (buf, cp);
 		}
 		bp = cp;
 		passno = 1;
 
 again:
-		for (; isspace (*bp); bp++)
+		for (; isspace ((unsigned char) *bp); bp++)
 		    continue;
 		if (*bp == '(') {
 		    int i;
@@ -421,17 +407,17 @@ invalid:
 		    if ((result = (mh_strcasecmp (bp, "plain") != 0)))
 			goto out;
 		    *dp = c;
-		    for (dp++; isspace (*dp); dp++)
+		    for (dp++; isspace ((unsigned char) *dp); dp++)
 			continue;
 		    if (*dp) {
 			if ((result = !uprf (dp, "charset")))
 			    goto out;
 			dp += sizeof("charset") - 1;
-			while (isspace (*dp))
+			while (isspace ((unsigned char) *dp))
 			    dp++;
 			if (*dp++ != '=')
 			    goto invalid;
-			while (isspace (*dp))
+			while (isspace ((unsigned char) *dp))
 			    dp++;
 			if (*dp == '"') {
 			    if ((bp = strchr(++dp, '"')))
@@ -461,6 +447,7 @@ out:
 		free (cp);
 		if (result) {
 		    fclose (fp);
+		    m_getfld_state_destroy (&gstate);
 		    return result;
 		}
 		break;
@@ -473,12 +460,12 @@ out:
 		cp = add (buf, NULL);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
-		    state = m_getfld (gstate, name, buf, &bufsz, fp);
+		    state = m_getfld (&gstate, name, buf, &bufsz, fp);
 		    cp = add (buf, cp);
 		}
-		for (bp = cp; isspace (*bp); bp++)
+		for (bp = cp; isspace ((unsigned char) *bp); bp++)
 		    continue;
-		for (dp = bp; istoken (*dp); dp++)
+		for (dp = bp; istoken ((unsigned char) *dp); dp++)
 		    continue;
 		*dp = '\0';
 		result = (mh_strcasecmp (bp, "7bit")
@@ -488,6 +475,7 @@ out:
 		free (cp);
 		if (result) {
 		    fclose (fp);
+		    m_getfld_state_destroy (&gstate);
 		    return result;
 		}
 		break;
@@ -499,7 +487,7 @@ out:
 	     */
 	    while (state == FLDPLUS) {
 		bufsz = sizeof buf;
-		state = m_getfld (gstate, name, buf, &bufsz, fp);
+		state = m_getfld (&gstate, name, buf, &bufsz, fp);
 	    }
 	    break;
 
@@ -509,8 +497,8 @@ out:
 	     */
 	default:
 	    fclose (fp);
+	    m_getfld_state_destroy (&gstate);
 	    return 0;
 	}
     }
-    m_getfld_state_destroy (&gstate);
 }