X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmsgchk.c;h=1a59a3bd7d02c9f13a6c43d69441cf7ad456eb8b;hp=9489ef0d716ccbc86dba511dcb6c8451f0d3bd05;hb=d8916ff5d389de5ab225cd6f40aeda1b285d0f28;hpb=8f4c5da8971926f7eccc912f7998c343aef3c33b

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 9489ef0..1a59a3b 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -3,10 +3,14 @@
  * msgchk.c -- check for mail
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
-#include <mts/generic/mts.h>
+#include <h/mts.h>
 #include <h/tws.h>
 #include <pwd.h>
 
@@ -81,6 +85,8 @@ static struct swit switches[] = {
     { "sasl", SASLminc(-4) },
 #define SASLMECHSW		15
     { "saslmech", SASLminc(-5) },
+#define PROXYSW 		16
+    { "proxy command", POPminc(-5) },
     { NULL, 0 }
 };
 
@@ -111,7 +117,7 @@ static int donote (char *, int);
 static int checkmail (char *, char *, int, int, int);
 
 #ifdef POP
-static int remotemail (char *, char *, int, int, int, int, int, int, char *);
+static int remotemail (char *, char *, char *, int, int, int, int, int, int, char *);
 #endif
 
 
@@ -123,7 +129,8 @@ main (int argc, char **argv)
     int kpop = 0, sasl = 0;
     int snoop = 0, vecp = 0;
     uid_t uid;
-    char *cp, *host = NULL, *user, buf[BUFSIZ], *saslmech = NULL; 
+    char *cp, *host = NULL, *user, *proxy = NULL; 
+    char buf[BUFSIZ], *saslmech = NULL; 
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 
@@ -233,6 +240,11 @@ main (int argc, char **argv)
 		    if (!(saslmech = *argp++) || *saslmech == '-')
 			adios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
+
+		case PROXYSW:
+		    if (!(proxy = *argp++) || *proxy == '-')
+			adios (NULL, "missing argument to %s", argp[-2]);
+		    continue;
 	    }
 	}
 	if (vecp >= MAXVEC-1)
@@ -282,12 +294,12 @@ main (int argc, char **argv)
 	    kpop = 1;
 	}
 	if (vecp == 0) {
-	    status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop,
-				 sasl, saslmech);
+	    status = remotemail (host, user, proxy, rpop, kpop, notifysw, 1,
+				 snoop, sasl, saslmech);
 	} else {
 	    for (vecp = 0; vec[vecp]; vecp++)
-		status += remotemail (host, vec[vecp], rpop, kpop, notifysw, 0,
-				      snoop, sasl, saslmech);
+		status += remotemail (host, vec[vecp], proxy, rpop, kpop,
+		                      notifysw, 0, snoop, sasl, saslmech);
 	}
     } else {
 #endif /* POP */
@@ -295,13 +307,12 @@ main (int argc, char **argv)
     if (vecp == 0) {
 	char *home;
 
-	home = (uid = geteuid()) ? home = getenv ("HOME") : NULL;
-	if (home == NULL) {
+        /* Not sure this check makes sense... */
+	if (!geteuid() || NULL == (home = getenv("HOME"))) {
 	    pw = getpwnam (user);
 	    if (pw == NULL)
 		adios (NULL, "unable to get information about user");
-	    if (home == NULL)
-		home = pw->pw_dir;
+	    home = pw->pw_dir;
 	}
 	status = checkmail (user, home, datesw, notifysw, 1);
     } else {
@@ -316,7 +327,8 @@ main (int argc, char **argv)
     }		/* host == NULL */
 #endif
 
-    return done (status);
+    done (status);
+    return 1;
 }
 
 
@@ -408,7 +420,7 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 extern char response[];
 
 static int
-remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop, int sasl, char *saslmech)
+remotemail (char *host, char *user, char *proxy, int rpop, int kpop, int notifysw, int personal, int snoop, int sasl, char *saslmech)
 {
     int nmsgs, nbytes, status;
     char *pass = NULL;
@@ -421,7 +433,7 @@ remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int person
 	ruserpass (host, &user, &pass);
 
     /* open the POP connection */
-    if (pop_init (host, user, pass, snoop, kpop ? 1 : rpop, kpop,
+    if (pop_init (host, user, pass, proxy, snoop, kpop ? 1 : rpop, kpop,
 		  sasl, saslmech) == NOTOK
 	    || pop_stat (&nmsgs, &nbytes) == NOTOK	/* check for messages  */
 	    || pop_quit () == NOTOK) {			/* quit POP connection */