X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmsgchk.c;h=8294d4624cdeb08446b43e987a151c76e3ff611b;hb=7e5bac1a416e400bd3c8941b1c312577f2d9e9e4;hp=fa2336f9e540c60da399800bb898464565eb817f;hpb=c05210483d82bf5f3786725ff80e12444088a701;p=mmh

diff --git a/uip/msgchk.c b/uip/msgchk.c
index fa2336f..8294d46 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)
@@ -38,23 +30,23 @@ 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) },
-#define PORTSW			 8
-    { "port name/number", POPminc(-4) },
-#define VERSIONSW               10
+    { "user username", 0 },
+#define PORTSW			 6
+    { "port name/number", 0 },
+#define VERSIONSW                7
     { "version", 0 },
-#define	HELPSW                  11
+#define	HELPSW                   8
     { "help", 0 },
-#define SNOOPSW                 12
+#define SNOOPSW                  9
     { "snoop", -5 },
-#define SASLSW                  14
+#define SASLSW                  10
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW		15
+#define SASLMECHSW		11
     { "saslmech", SASLminc(-5) },
-#define PROXYSW 		16
-    { "proxy command", POPminc(-5) },
+#define PROXYSW 		12
+    { "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,7 +87,6 @@ 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];
@@ -116,16 +106,13 @@ 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 == '-') {
@@ -207,7 +194,6 @@ main (int argc, char **argv)
 	    vec[vecp++] = cp;
     }
 
-#ifdef POP
     /*
      * If -host is not specified by user
      */
@@ -221,12 +207,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 +221,6 @@ main (int argc, char **argv)
 				      snoop, sasl, saslmech);
 	}
     } else {
-#endif /* POP */
 
     if (vecp == 0) {
 	char *home;
@@ -258,9 +241,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 +332,6 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 }
 
 
-#ifdef POP
 extern char response[];
 
 static int
@@ -369,7 +349,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 +379,3 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
     return status;
 }
-#endif /* POP */