X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8a14191c0a0ad15bb8f35b49748c75c1e0a8c2f4..6547ca9f73c3f02b2356017bbd7ff85292f8e4a1:/uip/msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index af25b1e3..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 <h/mh.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include "h/done.h"
+#include <h/utils.h>
 #include <pwd.h>
 
 #include <h/popsbr.h>
@@ -69,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)
@@ -80,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 *);
@@ -155,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:
@@ -209,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;
     }
 
     /*
@@ -326,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;
@@ -401,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;