Clarified description of clobber -auto/-suffix per Ralph's suggestion.

[mmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 03525c8..3654995 100644 (file)
--- 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)
@@ -38,11 +30,11 @@ static struct swit switches[] = {
 #define        NNOTESW                  3
     { "nonotify type", 0 },
 #define        HOSTSW                   4
-    { "host hostname", POPminc (-4) },
+    { "host hostname", 0 },
 #define        USERSW                   5
-    { "user username", POPminc (-4) },
+    { "user username", 0 },
 #define PORTSW                  6
-    { "port name/number", POPminc(-4) },
+    { "port name/number", 0 },
 #define VERSIONSW                7
     { "version", 0 },
 #define        HELPSW                   8
@@ -54,7 +46,7 @@ static struct swit switches[] = {
 #define SASLMECHSW             11
     { "saslmech", SASLminc(-5) },
 #define PROXYSW                12
-    { "proxy command", POPminc(-5) },
+    { "proxy command", 0 },
     { NULL, 0 }
 };
 
@@ -65,6 +57,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 +77,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 +87,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 +101,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 +119,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 +186,6 @@ main (int argc, char **argv)
            vec[vecp++] = cp;
     }
 
-#ifdef POP
     /*
      * If -host is not specified by user
      */
@@ -221,12 +199,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 +213,6 @@ main (int argc, char **argv)
                                      snoop, sasl, saslmech);
        }
     } else {
-#endif /* POP */
 
     if (vecp == 0) {
        char *home;
@@ -258,9 +233,7 @@ main (int argc, char **argv)
                advise (NULL, "no such user as %s", vec[vecp]);
        }
     }
-#ifdef POP
     }          /* host == NULL */
-#endif
 
     done (status);
     return 1;
@@ -351,7 +324,6 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 }
 
 
-#ifdef POP
 extern char response[];
 
 static int
@@ -369,7 +341,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 +371,3 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
     return status;
 }
-#endif /* POP */