X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c05210483d82bf5f3786725ff80e12444088a701..eceaf7315dcf1e04a5195d3da52c5c9836fdce25:/uip/msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index fa2336f9..6a0a12e7 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -12,15 +12,7 @@
 #include <h/tws.h>
 #include <pwd.h>
 
-#ifdef POP
-# include <h/popsbr.h>
-#endif
-
-#ifndef	POP
-# define POPminc(a) (a)
-#else
-# define POPminc(a)  0
-#endif
+#include <h/popsbr.h>
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
@@ -28,35 +20,28 @@
 # define SASLminc(a)  0
 #endif
 
-static struct swit switches[] = {
-#define	DATESW                   0
-    { "date", 0 },
-#define	NDATESW                  1
-    { "nodate", 0 },
-#define	NOTESW                   2
-    { "notify type", 0 },
-#define	NNOTESW                  3
-    { "nonotify type", 0 },
-#define	HOSTSW                   4
-    { "host hostname", POPminc (-4) },
-#define	USERSW                   5
-    { "user username", POPminc (-4) },
-#define PORTSW			 8
-    { "port name/number", POPminc(-4) },
-#define VERSIONSW               10
-    { "version", 0 },
-#define	HELPSW                  11
-    { "help", 0 },
-#define SNOOPSW                 12
-    { "snoop", -5 },
-#define SASLSW                  14
-    { "sasl", SASLminc(-4) },
-#define SASLMECHSW		15
-    { "saslmech", SASLminc(-5) },
-#define PROXYSW 		16
-    { "proxy command", POPminc(-5) },
-    { NULL, 0 }
-};
+#define MSGCHK_SWITCHES \
+    X("date", 0, DATESW) \
+    X("nodate", 0, NDATESW) \
+    X("notify type", 0, NOTESW) \
+    X("nonotify type", 0, NNOTESW) \
+    X("host hostname", 0, HOSTSW) \
+    X("user username", 0, USERSW) \
+    X("port name/number", 0, PORTSW) \
+    X("version", 0, VERSIONSW) \
+    X("help", 0, HELPSW) \
+    X("snoop", -5, SNOOPSW) \
+    X("sasl", SASLminc(-4), SASLSW) \
+    X("saslmech", SASLminc(-5), SASLMECHSW) \
+    X("proxy command", 0, PROXYSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(MSGCHK);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(MSGCHK, switches);
+#undef X
 
 /*
  * Maximum numbers of users we can check (plus
@@ -65,6 +50,8 @@ static struct swit switches[] = {
 #define MAXVEC  51
 
 #define	NT_NONE	0x0
+#ifdef NT_NONE
+#endif /* Use NT_NONE to prevent warning from gcc -Wunused-macros. */
 #define	NT_MAIL	0x1
 #define	NT_NMAI	0x2
 #define	NT_ALL	(NT_MAIL | NT_NMAI)
@@ -83,11 +70,8 @@ static struct swit switches[] = {
  */
 static int donote (char *, int);
 static int checkmail (char *, char *, int, int, int);
-
-#ifdef POP
 static int remotemail (char *, char *, char *, char *, int, int, int, int,
 		       char *);
-#endif
 
 
 int
@@ -96,17 +80,11 @@ main (int argc, char **argv)
     int datesw = 1, notifysw = NT_ALL;
     int status = 0, sasl = 0;
     int snoop = 0, vecp = 0;
-    uid_t uid;
     char *cp, *host = NULL, *port = NULL, *user, *proxy = NULL; 
     char buf[BUFSIZ], *saslmech = NULL; 
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 
-#ifdef HESIOD
-    struct hes_postoffice *po;
-    char *tmphost;
-#endif
-
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -116,17 +94,11 @@ main (int argc, char **argv)
     context_read();
 
     mts_init (invo_name);
-    uid = getuid ();
     user = getusername();
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
-#ifdef POP
-    if ((cp = getenv ("MHPOPDEBUG")) && *cp)
-	snoop++;
-#endif
-
     while ((cp = *argp++)) {
 	if (*cp == '-') {
 	    switch (smatch (++cp, switches)) {
@@ -140,10 +112,10 @@ main (int argc, char **argv)
 		    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
 			invo_name);
 		    print_help (buf, switches, 1);
-		    done (1);
+		    done (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (1);
+		    done (0);
 
 		case DATESW:
 		    datesw++;
@@ -207,7 +179,6 @@ main (int argc, char **argv)
 	    vec[vecp++] = cp;
     }
 
-#ifdef POP
     /*
      * If -host is not specified by user
      */
@@ -221,12 +192,10 @@ main (int argc, char **argv)
     }
     if (!host || !*host)
 	host = NULL;
-#endif /* POP */
 
     if (vecp != 0)
 	vec[vecp] = NULL;
 
-#ifdef POP
     if (host) {
 	if (vecp == 0) {
 	    status = remotemail (host, port, user, proxy, notifysw, 1,
@@ -237,7 +206,6 @@ main (int argc, char **argv)
 				      snoop, sasl, saslmech);
 	}
     } else {
-#endif /* POP */
 
     if (vecp == 0) {
 	char *home;
@@ -258,24 +226,25 @@ main (int argc, char **argv)
 		advise (NULL, "no such user as %s", vec[vecp]);
 	}
     }
-#ifdef POP
     }		/* host == NULL */
-#endif
 
     done (status);
     return 1;
 }
 
 
-static struct swit ntswitches[] = {
-#define	NALLSW     0
-    { "all", 0 },
-#define	NMAISW     1
-    { "mail", 0 },
-#define	NNMAISW	   2
-    { "nomail", 0 },
-    { NULL, 0 }
-};
+#define NOTE_SWITCHES \
+    X("all", 0, NALLSW) \
+    X("mail", 0, NMAISW) \
+    X("nomail", 0, NNMAISW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(NOTE);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(NOTE, ntswitches);
+#undef X
 
 
 static int
@@ -351,7 +320,6 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 }
 
 
-#ifdef POP
 extern char response[];
 
 static int
@@ -369,7 +337,7 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 	ruserpass (host, &user, &pass);
 
     /* open the POP connection */
-    if (pop_init (host, user, port, pass, proxy, snoop, sasl, saslmech) == NOTOK
+    if (pop_init (host, port, user, pass, proxy, snoop, sasl, saslmech) == NOTOK
 	    || pop_stat (&nmsgs, &nbytes) == NOTOK	/* check for messages  */
 	    || pop_quit () == NOTOK) {			/* quit POP connection */
 	advise (NULL, "%s", response);
@@ -399,4 +367,3 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
     return status;
 }
-#endif /* POP */