Add support for a -nosasl switch.

[mmh] / uip / inc.c

diff --git a/uip/inc.c b/uip/inc.c
index edb288f..8716edd 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -89,9 +89,11 @@ static struct swit switches[] = {
     { "snoop", -5 },
 #define SASLSW                    20
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW                21
+#define NOSASLSW                  21
+    { "nosasl", SASLminc(-6) },
+#define SASLMECHSW                22
     { "saslmech", SASLminc(-8) },
-#define PROXYSW                   22
+#define PROXYSW                   23
     { "proxy command", 0 },
     { NULL, 0 }
 };
@@ -202,7 +204,7 @@ main (int argc, char **argv)
     struct msgs *mp = NULL;
     struct stat st, s1;
     FILE *aud = NULL;
-    char b[MAXPATHLEN + 1];
+    char b[PATH_MAX + 1];
     char *maildir_copy = NULL; /* copy of mail directory because the static gets overwritten */
 
     int nmsgs, nbytes;
@@ -245,9 +247,6 @@ main (int argc, char **argv)
     if (pophost && *pophost)
        host = pophost;
 
-    if ((cp = getenv ("MHPOPDEBUG")) && *cp)
-       snoop++;
-
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
@@ -260,10 +259,10 @@ main (int argc, char **argv)
            case HELPSW: 
                snprintf (buf, sizeof(buf), "%s [+folder] [switches]", invo_name);
                print_help (buf, switches, 1);
-               done (1);
+               done (0);
            case VERSIONSW:
                print_version(invo_name);
-               done (1);
+               done (0);
 
            case AUDSW: 
                if (!(cp = *argp++) || *cp == '-')
@@ -338,7 +337,7 @@ main (int argc, char **argv)
                continue;
 
            case PORTSW:
-               if (!(host = *argp++) || *port == '-')
+               if (!(port = *argp++) || *port == '-')
                    adios (NULL, "missing argument to %s", argp[-2]);
                continue;
 
@@ -362,6 +361,9 @@ main (int argc, char **argv)
            case SASLSW:
                sasl++;
                continue;
+           case NOSASLSW:
+               sasl = 0;
+               continue;
        
            case SASLMECHSW:
                if (!(saslmech = *argp++) || *saslmech == '-')