X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5cb3431b8210554b89425d60b3c0aa4f521b7414..63621a81d16ab743de6b57d47578a9a2c670ad22:/uip/msgchk.c

diff --git a/uip/msgchk.c b/uip/msgchk.c
index eed61cd2..73ed7284 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,7 @@
 #include <h/mh.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/utils.h>
 #include <pwd.h>
 
 #include <h/popsbr.h>
@@ -80,7 +79,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 +154,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 +207,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;
     }
 
     /*
@@ -265,7 +262,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 */
@@ -389,7 +386,7 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 		  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;
     }
 
@@ -401,7 +398,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;