X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8bb0f8000b86df9270f2410de3fb6f41fa63e88b..030c6e4df060fcbc33db4495148267e90c960d9d:/uip/slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index bb9b5ac4..f570aaaf 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -55,39 +55,30 @@
 #include <utmpx.h>
 #endif /* HAVE_GETUTXENT */
 
-static struct swit switches[] = {
-#define	ADDRSW         0
-    { "addr address", 0 },
-#define	USERSW         1
-    { "user name", 0 },
-#define	FILESW         2
-    { "file file", 0 },
-#define	SENDERSW       3
-    { "sender address", 0 },
-#define	MAILBOXSW      4
-    { "mailbox file", 0 },
-#define	HOMESW         5
-    { "home directory", -4 },
-#define	INFOSW         6
-    { "info data", 0 },
-#define	MAILSW         7
-    { "maildelivery file", 0 },
-#define	VERBSW         8
-    { "verbose", 0 },
-#define	NVERBSW        9
-    { "noverbose", 0 },
-#define SUPPRESSDUP   10
-    { "suppressdup", 0 },
-#define NSUPPRESSDUP 11
-    { "nosuppressdup", 0 },
-#define	DEBUGSW       12
-    { "debug", 0 },
-#define VERSIONSW     13
-    { "version", 0 },
-#define	HELPSW        14
-    { "help", 0 },
-    { NULL, 0 }
-};
+#define SLOCAL_SWITCHES \
+    X("addr address", 0, ADDRSW) \
+    X("user name", 0, USERSW) \
+    X("file file", 0, FILESW) \
+    X("sender address", 0, SENDERSW) \
+    X("mailbox file", 0, MAILBOXSW) \
+    X("home directory", -4, HOMESW) \
+    X("info data", 0, INFOSW) \
+    X("maildelivery file", 0, MAILSW) \
+    X("verbose", 0, VERBSW) \
+    X("noverbose", 0, NVERBSW) \
+    X("suppressdup", 0, SUPPRESSDUP) \
+    X("nosuppressdup", 0, NSUPPRESSDUP) \
+    X("debug", 0, DEBUGSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(SLOCAL);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(SLOCAL, switches);
+#undef X
 
 static int globbed = 0;		/* have we built "vars" table yet?        */
 static int parsed = 0;		/* have we built header field table yet   */
@@ -654,7 +645,7 @@ static int
 split (char *cp, char **vec)
 {
     int i;
-    unsigned char *s;
+    char *s;
 
     s = cp;
 
@@ -663,7 +654,7 @@ split (char *cp, char **vec)
 	vec[i] = NULL;
 
 	/* zap any whitespace and comma's */
-	while (isspace (*s) || *s == ',')
+	while (isspace ((unsigned char) *s) || *s == ',')
 	    *s++ = 0;
 
 	/* end of buffer, time to leave */
@@ -693,7 +684,7 @@ split (char *cp, char **vec)
 	vec[i++] = s++;
 
 	/* move forward to next field delimiter */
-	while (*s && !isspace (*s) && *s != ',')
+	while (*s && !isspace ((unsigned char) *s) && *s != ',')
 	    s++;
     }
     vec[i] = NULL;
@@ -1162,8 +1153,8 @@ static void
 get_sender (char *envelope, char **sender)
 {
     int i;
-    unsigned char *cp;
-    unsigned char buffer[BUFSIZ];
+    char *cp;
+    char buffer[BUFSIZ];
 
     if (envelope == NULL) {
 	*sender = getcpy ("");
@@ -1183,7 +1174,7 @@ get_sender (char *envelope, char **sender)
     *cp = 0;
 
     for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--)
-	if (isspace (*cp))
+	if (isspace ((unsigned char) *cp))
 	    *cp = 0;
 	else
 	    break;
@@ -1305,7 +1296,7 @@ static char *
 trim (char *cp)
 {
     char buffer[BUFSIZ*4];
-    unsigned char *bp, *sp;
+    char *bp, *sp;
 
     if (cp == NULL)
 	return NULL;
@@ -1315,12 +1306,12 @@ trim (char *cp)
     bp = buffer;
 
     /* skip over leading whitespace */
-    while (isspace(*bp))
+    while (isspace((unsigned char) *bp))
 	bp++;
 
     /* start at the end and zap trailing whitespace */
     for (sp = bp + strlen(bp) - 1; sp >= bp; sp--) {
-	if (isspace(*sp))
+	if (isspace((unsigned char) *sp))
 	    *sp = 0;
 	else
 	    break;
@@ -1328,7 +1319,7 @@ trim (char *cp)
 
     /* replace remaining whitespace with spaces */
     for (sp = bp; *sp; sp++)
-	if (isspace(*sp))
+	if (isspace((unsigned char) *sp))
 	    *sp = ' ';
 
     /* now return a copy */