SPECS: Use `command-line interface' in one-line summary.

[nmh] / uip / msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 44d9352845b4a5b89512ba6ed43c9a52ebed6801..df37d4ab49797e46a113383616d182be4fddf622 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -8,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>
@@ -67,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)
@@ -78,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 *);
@@ -153,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:
@@ -207,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;
     }
 
     /*
@@ -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;