X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6fc2909634fb431c65ecfa8b6db4f6519f99b389..6547ca9f73c3f02b2356017bbd7ff85292f8e4a1:/uip/msgchk.c diff --git a/uip/msgchk.c b/uip/msgchk.c index d7b2c2f0..df37d4ab 100644 --- a/uip/msgchk.c +++ b/uip/msgchk.c @@ -1,6 +1,4 @@ - -/* - * msgchk.c -- check for mail +/* msgchk.c -- check for mail * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -10,6 +8,8 @@ #include #include #include +#include "h/done.h" +#include #include #include @@ -38,10 +38,13 @@ X("help", 0, HELPSW) \ X("snoop", 0, SNOOPSW) \ X("sasl", SASLminc(4), SASLSW) \ + X("nosasl", SASLminc(6), NOSASLSW) \ X("saslmech", SASLminc(5), SASLMECHSW) \ X("authservice", SASLminc(0), AUTHSERVICESW) \ X("initialtls", TLSminc(-10), INITTLSSW) \ X("notls", TLSminc(-5), NOTLSSW) \ + X("certverify", TLSminc(-10), CERTVERSW) \ + X("nocertverify", TLSminc(-12), NOCERTVERSW) \ X("proxy command", 0, PROXYSW) \ #define X(sw, minchars, id) id, @@ -66,9 +69,6 @@ DEFINE_SWITCH_ARRAY(MSGCHK, switches); #define NT_ALL (NT_MAIL | NT_NMAI) #define NONEOK 0x0 -#define UUCPOLD 0x1 -#define UUCPNEW 0x2 -#define UUCPOK (UUCPOLD | UUCPNEW) #define MMDFOLD 0x4 #define MMDFNEW 0x8 #define MMDFOK (MMDFOLD | MMDFNEW) @@ -77,7 +77,7 @@ DEFINE_SWITCH_ARRAY(MSGCHK, switches); /* * static prototypes */ -static int donote (char *, int); +static int donote (char *, int) PURE; static int checkmail (char *, char *, int, int, int); static int remotemail (char *, char *, char *, char *, int, int, int, int, char *, int, const char *); @@ -87,7 +87,7 @@ int main (int argc, char **argv) { int datesw = 1, notifysw = NT_ALL; - int status = 0, sasl = 0, tls = 0; + int status = 0, sasl = 0, tls = 0, noverify = 0; int snoop = 0, vecp = 0; char *cp, *host = NULL, *port = NULL, *user = NULL, *proxy = NULL; char buf[BUFSIZ], *saslmech = NULL, *auth_svc = NULL; @@ -152,8 +152,7 @@ main (int argc, char **argv) adios (NULL, "missing argument to %s", argp[-2]); if (vecp >= MAXVEC-1) adios (NULL, "you can only check %d users at a time", MAXVEC-1); - else - user = vec[vecp++] = cp; + user = vec[vecp++] = cp; continue; case SNOOPSW: @@ -164,6 +163,10 @@ main (int argc, char **argv) sasl++; continue; + case NOSASLSW: + sasl = 0; + continue; + case SASLMECHSW: if (!(saslmech = *argp++) || *saslmech == '-') adios (NULL, "missing argument to %s", argp[-2]); @@ -177,6 +180,14 @@ main (int argc, char **argv) tls = 0; continue; + case CERTVERSW: + noverify = 0; + continue; + + case NOCERTVERSW: + noverify++; + continue; + case AUTHSERVICESW: #ifdef OAUTH_SUPPORT if (!(auth_svc = *argp++) || *auth_svc == '-') @@ -194,8 +205,7 @@ main (int argc, char **argv) } if (vecp >= MAXVEC-1) adios (NULL, "you can only check %d users at a time", MAXVEC-1); - else - vec[vecp++] = cp; + vec[vecp++] = cp; } /* @@ -216,13 +226,21 @@ main (int argc, char **argv) vec[vecp] = NULL; if (host) { + int tlsflag = 0; + + if (tls) + tlsflag |= P_INITTLS; + + if (noverify) + tlsflag |= P_NOVERIFY; + if (vecp == 0) { status = remotemail (host, port, user, proxy, notifysw, 1, - snoop, sasl, saslmech, tls, auth_svc); + snoop, sasl, saslmech, tlsflag, auth_svc); } else { for (vecp = 0; vec[vecp]; vecp++) status += remotemail (host, port, vec[vecp], proxy, notifysw, 0, - snoop, sasl, saslmech, tls, auth_svc); + snoop, sasl, saslmech, tlsflag, auth_svc); } } else { if (user == NULL) user = getusername (); @@ -242,7 +260,7 @@ main (int argc, char **argv) if ((pw = getpwnam (vec[vecp]))) status += checkmail (pw->pw_name, pw->pw_dir, datesw, notifysw, 0); else - advise (NULL, "no such user as %s", vec[vecp]); + inform("no such user as %s", vec[vecp]); } } } /* host == NULL */ @@ -303,19 +321,14 @@ checkmail (char *user, char *home, int datesw, int notifysw, int personal) mf = (stat (buffer, &st) == NOTOK || st.st_size == 0) ? NONEOK : st.st_atime <= st.st_mtime ? MMDFNEW : MMDFOLD; - if ((mf & UUCPOK) || (mf & MMDFOK)) { + if (mf & MMDFOK) { if (notifysw & NT_MAIL) { if (personal) printf ("You have "); else printf ("%s has ", user); - if (mf & UUCPOK) - printf ("%s old-style bell", mf & UUCPOLD ? "old" : "new"); - if ((mf & UUCPOK) && (mf & MMDFOK)) - printf (" and "); if (mf & MMDFOK) - printf ("%s%s", mf & MMDFOLD ? "old" : "new", - mf & UUCPOK ? " Internet" : ""); + printf ("%s", mf & MMDFOLD ? "old" : "new"); printf (" mail waiting"); } else { notifysw = 0; @@ -336,7 +349,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) - printf ("\n"); + putchar('\n'); return status; } @@ -350,26 +363,23 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw, 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"); } - nmh_get_credentials (host, user, sasl, &creds); } else { if (user == NULL) { adios (NULL, "must specify -user with -saslmech xoauth2"); } - creds.user = user; } /* open the POP connection */ - if (pop_init (host, port, creds.user, creds.password, proxy, snoop, sasl, - saslmech, tls, 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); + inform("%s", response); return 1; } @@ -381,7 +391,7 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw, printf ("%s has ", user); printf ("%d message%s (%d bytes)", - nmsgs, nmsgs != 1 ? "s" : "", nbytes); + nmsgs, PLURALS(nmsgs), nbytes); } else notifysw = 0;