Added const qualifier to char * arguments of add(), addlist(),

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 2553c496f7850463b76dc1e20cbe391893ca7272..6a0a12e7940f7b094ff790bcc7e42ff0306093b8 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -2,77 +2,46 @@
 /*
  * msgchk.c -- check for mail
  *
 /*
  * 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 <h/mh.h>

-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>

 #include <pwd.h>
 
 #include <pwd.h>
 

-#ifdef POP
-# include <h/popsbr.h>
-#endif
-
-#ifdef HESIOD
-# include <hesiod.h>
-#endif
-
-#ifndef        POP
-# define POPminc(a) (a)
-#else
-# define POPminc(a)  0
-#endif
+#include <h/popsbr.h>

 
 

-#ifndef        RPOP
-# define RPOPminc(a) (a)
+#ifndef CYRUS_SASL
+# define SASLminc(a) (a)

 #else
 #else

-# define RPOPminc(a)  0
+# define SASLminc(a)  0

 #endif
 
 #endif
 

-#ifndef        APOP
-# define APOPminc(a) (a)
-#else
-# define APOPminc(a)  0
-#endif
-
-#ifndef        KPOP
-# define KPOPminc(a) (a)
-#else
-# define KPOPminc(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        APOPSW                   6
-    { "apop", APOPminc (-4) },
-#define        NAPOPSW                  7
-    { "noapop", APOPminc (-6) },
-#define        RPOPSW                   8
-    { "rpop", RPOPminc (-4) },
-#define        NRPOPSW                  9
-    { "norpop", RPOPminc (-6) },
-#define VERSIONSW               10
-    { "version", 0 },
-#define        HELPSW                  11
-    { "help", 0 },
-#define SNOOPSW                 12
-    { "snoop", -5 },
-#define KPOPSW                  13
-    { "kpop", KPOPminc (-4) },
-    { 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
 
 /*
  * Maximum numbers of users we can check (plus


@@ -81,6 +50,8 @@ static struct swit switches[] = {
 #define MAXVEC  51
 
 #define        NT_NONE 0x0
 #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)
 #define        NT_MAIL 0x1
 #define        NT_NMAI 0x2
 #define        NT_ALL  (NT_MAIL | NT_NMAI)


@@ -99,29 +70,21 @@ static struct swit switches[] = {
  */
 static int donote (char *, int);
 static int checkmail (char *, char *, int, int, int);
  */
 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);
-#endif
+static int remotemail (char *, char *, char *, char *, int, int, int, int,
+                      char *);

 
 
 int
 main (int argc, char **argv)
 {
     int datesw = 1, notifysw = NT_ALL;
 
 
 int
 main (int argc, char **argv)
 {
     int datesw = 1, notifysw = NT_ALL;

-    int rpop, status = 0;
-    int kpop = 0;
+    int status = 0, sasl = 0;

     int snoop = 0, vecp = 0;
     int snoop = 0, vecp = 0;

-    uid_t uid;
-    char *cp, *host = NULL, *user, buf[BUFSIZ];
+    char *cp, *host = NULL, *port = NULL, *user, *proxy = NULL; 
+    char buf[BUFSIZ], *saslmech = NULL; 

     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 
     char **argp, **arguments, *vec[MAXVEC];
     struct passwd *pw;
 

-#ifdef HESIOD
-    struct hes_postoffice *po;
-    char *tmphost;
-#endif
-

 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif


@@ -131,19 +94,11 @@ main (int argc, char **argv)
     context_read();
 
     mts_init (invo_name);
     context_read();
 
     mts_init (invo_name);

-    uid = getuid ();

     user = getusername();
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     user = getusername();
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 

-#ifdef POP
-    if ((cp = getenv ("MHPOPDEBUG")) && *cp)
-       snoop++;
-#endif
-
-    rpop = 0;
-

     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {
     while ((cp = *argp++)) {
        if (*cp == '-') {
            switch (smatch (++cp, switches)) {


@@ -157,10 +112,10 @@ main (int argc, char **argv)
                    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
                        invo_name);
                    print_help (buf, switches, 1);
                    snprintf (buf, sizeof(buf), "%s [switches] [users ...]",
                        invo_name);
                    print_help (buf, switches, 1);

-                   done (1);
+                   done (0);

                case VERSIONSW:
                    print_version(invo_name);
                case VERSIONSW:
                    print_version(invo_name);

-                   done (1);
+                   done (0);

 
                case DATESW:
                    datesw++;
 
                case DATESW:
                    datesw++;


@@ -184,6 +139,12 @@ main (int argc, char **argv)
                    if (!(host = *argp++) || *host == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
                    if (!(host = *argp++) || *host == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;

+
+               case PORTSW:
+                   if (!(port = *argp++) || *port == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);
+               continue;
+

                case USERSW: 
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);
                case USERSW: 
                    if (!(cp = *argp++) || *cp == '-')
                        adios (NULL, "missing argument to %s", argp[-2]);


@@ -193,26 +154,22 @@ main (int argc, char **argv)
                        vec[vecp++] = cp;
                    continue;
 
                        vec[vecp++] = cp;
                    continue;
 

-               case APOPSW: 
-                   rpop = -1;
-                   continue;
-               case NAPOPSW:
-                   rpop = 0;
+               case SNOOPSW:
+                   snoop++;

                    continue;
 
                    continue;
 

-               case RPOPSW: 
-                   rpop = 1;
+               case SASLSW:
+                   sasl++;

                    continue;
                    continue;

-               case NRPOPSW: 
-                   rpop = 0;
-                   continue;
-
-               case KPOPSW:
-                   kpop = 1;
+               
+               case SASLMECHSW:
+                   if (!(saslmech = *argp++) || *saslmech == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);

                    continue;
 
                    continue;
 

-               case SNOOPSW:
-                   snoop++;
+               case PROXYSW:
+                   if (!(proxy = *argp++) || *proxy == '-')
+                       adios (NULL, "missing argument to %s", argp[-2]);

                    continue;
            }
        }
                    continue;
            }
        }


@@ -222,25 +179,10 @@ main (int argc, char **argv)
            vec[vecp++] = cp;
     }
 
            vec[vecp++] = cp;
     }
 

-#ifdef POP

     /*
      * If -host is not specified by user
      */
     if (!host || !*host) {
     /*
      * If -host is not specified by user
      */
     if (!host || !*host) {

-# ifdef HESIOD
-       /*
-        * Scheme is:
-        *        use MAILHOST environment variable if present,
-        *  else try Hesiod.
-        *  If that fails, use the default (if any)
-        *  provided by mts.conf in mts_init()
-        */
-       if ((tmphost = getenv("MAILHOST")) != NULL)
-           pophost = tmphost;
-       else if ((po = hes_getmailhost(vecp ? vec[0] : user)) != NULL &&
-               strcmp(po->po_type, "POP") == 0)
-           pophost = po->po_host;
-# endif /* HESIOD */

        /*
         * If "pophost" is specified in mts.conf,
         * use it as default value.
        /*
         * If "pophost" is specified in mts.conf,
         * use it as default value.


@@ -250,34 +192,30 @@ main (int argc, char **argv)
     }
     if (!host || !*host)
        host = NULL;
     }
     if (!host || !*host)
        host = NULL;

-    if (!host || rpop <= 0)
-       setuid (uid);
-#endif /* POP */

 
     if (vecp != 0)
        vec[vecp] = NULL;
 
 
     if (vecp != 0)
        vec[vecp] = NULL;
 

-#ifdef POP

     if (host) {
        if (vecp == 0) {
     if (host) {
        if (vecp == 0) {

-           status = remotemail (host, user, rpop, kpop, notifysw, 1, snoop);
+           status = remotemail (host, port, user, proxy, notifysw, 1,
+                                snoop, sasl, saslmech);

        } else {
            for (vecp = 0; vec[vecp]; vecp++)
        } else {
            for (vecp = 0; vec[vecp]; vecp++)

-               status += remotemail (host, vec[vecp], rpop, kpop, notifysw, 0, snoop);
+               status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,
+                                     snoop, sasl, saslmech);

        }
     } else {
        }
     } else {

-#endif /* POP */

 
     if (vecp == 0) {
        char *home;
 
 
     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");
            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 {
        }
        status = checkmail (user, home, datesw, notifysw, 1);
     } else {


@@ -288,23 +226,25 @@ main (int argc, char **argv)
                advise (NULL, "no such user as %s", vec[vecp]);
        }
     }
                advise (NULL, "no such user as %s", vec[vecp]);
        }
     }

-#ifdef POP

     }          /* host == NULL */
     }          /* host == NULL */

-#endif

 
 

-    return done (status);
+    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
 
 
 static int


@@ -380,24 +320,24 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
 }
 
 
 }
 
 

-#ifdef POP

 extern char response[];
 
 static int
 extern char response[];
 
 static int

-remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int personal, int snoop)
+remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
+           int personal, int snoop, int sasl, char *saslmech)

 {
     int nmsgs, nbytes, status;
     char *pass = NULL;
 
     if (user == NULL)
        user = getusername ();
 {
     int nmsgs, nbytes, status;
     char *pass = NULL;
 
     if (user == NULL)
        user = getusername ();

-    if (kpop || (rpop > 0))
+    if (sasl)

        pass = getusername ();
     else
        ruserpass (host, &user, &pass);
 
     /* open the POP connection */
        pass = getusername ();
     else
        ruserpass (host, &user, &pass);
 
     /* open the POP connection */

-    if (pop_init (host, user, pass, snoop, kpop ? 1 : rpop, kpop) == 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);
            || pop_stat (&nmsgs, &nbytes) == NOTOK      /* check for messages  */
            || pop_quit () == NOTOK) {                  /* quit POP connection */
        advise (NULL, "%s", response);


@@ -427,4 +367,3 @@ remotemail (char *host, char *user, int rpop, int kpop, int notifysw, int person
 
     return status;
 }
 
     return status;
 }

-#endif /* POP */