Remove unused NCWD and NPWD #defines.

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index b6a5d80990052b750456777c8fa68f95b97f8c5e..a4613c27dab71d1189b741c22e1d4b98c33a57c6 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -20,6 +20,12 @@
 # define SASLminc(a)  0
 #endif
 
 # define SASLminc(a)  0
 #endif
 

+#ifndef TLS_SUPPORT
+# define TLSminc(a) (a)
+#else
+# define TLSminc(a)  0
+#endif
+

 #define MSGCHK_SWITCHES \
     X("date", 0, DATESW) \
     X("nodate", 0, NDATESW) \
 #define MSGCHK_SWITCHES \
     X("date", 0, DATESW) \
     X("nodate", 0, NDATESW) \


@@ -34,6 +40,8 @@
     X("sasl", SASLminc(4), SASLSW) \
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("saslmech", SASLminc(5), SASLMECHSW) \
     X("authservice", SASLminc(0), AUTHSERVICESW) \

+    X("initialtls", TLSminc(-10), INITTLSSW) \
+    X("notls", TLSminc(-5), NOTLSSW) \

     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,
     X("proxy command", 0, PROXYSW) \
 
 #define X(sw, minchars, id) id,


@@ -72,14 +80,14 @@ DEFINE_SWITCH_ARRAY(MSGCHK, switches);
 static int donote (char *, int);
 static int checkmail (char *, char *, int, int, int);
 static int remotemail (char *, char *, char *, char *, int, int, int, int,
 static int donote (char *, int);
 static int checkmail (char *, char *, int, int, int);
 static int remotemail (char *, char *, char *, char *, int, int, int, int,

-                      char *, const char *);
+                      char *, int, const 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 status = 0, sasl = 0;
+    int status = 0, sasl = 0, tls = 0;

     int snoop = 0, vecp = 0;
     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;
     int snoop = 0, vecp = 0;
     char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL;
     char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL;


@@ -161,6 +169,14 @@ main (int argc, char **argv)
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 
                        adios (NULL, "missing argument to %s", argp[-2]);
                    continue;
 

+               case INITTLSSW:
+                   tls++;
+                   continue;
+
+               case NOTLSSW:
+                   tls = 0;
+                   continue;
+

                case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
                    if (!(auth_svc = *argp++) || *auth_svc == '-')
                case AUTHSERVICESW:
 #ifdef OAUTH_SUPPORT
                    if (!(auth_svc = *argp++) || *auth_svc == '-')


@@ -202,11 +218,11 @@ main (int argc, char **argv)
     if (host) {
        if (vecp == 0) {
            status = remotemail (host, port, user, proxy, notifysw, 1,
     if (host) {
        if (vecp == 0) {
            status = remotemail (host, port, user, proxy, notifysw, 1,

-                                snoop, sasl, saslmech, auth_svc);
+                                snoop, sasl, saslmech, tls, auth_svc);

        } else {
            for (vecp = 0; vec[vecp]; vecp++)
                status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,
        } else {
            for (vecp = 0; vec[vecp]; vecp++)
                status += remotemail (host, port, vec[vecp], proxy, notifysw, 0,

-                                     snoop, sasl, saslmech, auth_svc);
+                                     snoop, sasl, saslmech, tls, auth_svc);

        }
     } else {
        if (user == NULL) user = getusername ();
        }
     } else {
        if (user == NULL) user = getusername ();


@@ -320,7 +336,7 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal)
        if (datesw && st.st_atime)
            printf ("; last read on %s", dtime (&st.st_atime, 1));
     if (notifysw)
        if (datesw && st.st_atime)
            printf ("; last read on %s", dtime (&st.st_atime, 1));
     if (notifysw)

-       printf ("\n");
+       putchar('\n');

 
     return status;
 }
 
     return status;
 }


@@ -330,27 +346,24 @@ extern char response[];
 
 static int
 remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 
 static int
 remotemail (char *host, char *port, char *user, char *proxy, int notifysw,

-           int personal, int snoop, int sasl, char *saslmech,
+           int personal, int snoop, int sasl, char *saslmech, int tls,

            const char *auth_svc)
 {
     int nmsgs, nbytes, status;
            const char *auth_svc)
 {
     int nmsgs, nbytes, status;

-    struct nmh_creds creds = { 0, 0, 0 };

 
     if (auth_svc == NULL) {
        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
            adios (NULL, "must specify -authservice with -saslmech xoauth2");
        }
 
     if (auth_svc == NULL) {
        if (saslmech  &&  ! strcasecmp(saslmech, "xoauth2")) {
            adios (NULL, "must specify -authservice with -saslmech xoauth2");
        }

-       nmh_get_credentials (host, user, sasl, &creds);

     } else {
        if (user == NULL) {
            adios (NULL, "must specify -user with -saslmech xoauth2");
        }
     } else {
        if (user == NULL) {
            adios (NULL, "must specify -user with -saslmech xoauth2");
        }

-       creds.user = user;

     }
 
     /* open the POP connection */
     }
 
     /* open the POP connection */

-    if (pop_init (host, port, creds.user, creds.password, proxy, snoop, sasl,
-                 saslmech, auth_svc) == NOTOK
+    if (pop_init (host, port, user, proxy, snoop, sasl, saslmech, tls,
+                 auth_svc) == 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);