From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Tue, 26 Sep 2017 20:14:06 +0000 (+0100)
Subject: msgchk.c: Remove UUCP tests; unused since `#ifdef MF'.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ab2c72d2f25e801aebf4cae0e0b8128b288ac5c5?hp=af9b66336bdbd198f3b1e7bca82e3d1278f27664

msgchk.c: Remove UUCP tests; unused since `#ifdef MF'.

The values UUCPOLD et al are never set so don't bother testing for them.
They haven't be possible in git's history.  They were guarded in the
past by `#ifdef MF';  that stood for `mail filter'.
---

diff --git a/uip/msgchk.c b/uip/msgchk.c
index e4aad8a1..df37d4ab 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -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)
@@ -324,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;