X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d6e8d44dbb990fe77f9380ef6cbcd5101807208e..28ec221002d755d33c41fa4b5d9673eee0abef9d:/uip/forw.c

diff --git a/uip/forw.c b/uip/forw.c
index c03c7b40..ef536a56 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -1,6 +1,4 @@
-
-/*
- * forw.c -- forward a message, or group of messages.
+/* forw.c -- forward a message, or group of messages.
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -248,10 +246,10 @@ main (int argc, char **argv)
 		    continue;
 
 		case BITSTUFFSW: 
-		    dashstuff = 1;	/* trinary logic */
+		    dashstuff = 1;	/* ternary logic */
 		    continue;
 		case NBITSTUFFSW: 
-		    dashstuff = -1;	/* trinary logic */
+		    dashstuff = -1;	/* ternary logic */
 		    continue;
 
 		case FROMSW:
@@ -333,7 +331,7 @@ try_it_again:
 			i = YESW;
 		    break;
 		default: 
-		    advise (NULL, "say what?");
+		    inform("say what?");
 		    break;
 	    }
 	}
@@ -590,7 +588,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 
 		if (msgnum == mp->lowsel) {
 		    snprintf (bp, buflen, " Forwarded Message%s",
-			mp->numsel > 1 ? "s" : "");
+			PLURALS(mp->numsel));
 		} else {
 		    snprintf (bp, buflen, " Message %d", msgcnt);
 		}
@@ -627,7 +625,7 @@ copy_draft (int out, char *digest, char *file, int volume, int issue, int dashst
 	strncpy (buffer, delim4, sizeof(buffer));
     } else {
 	snprintf (buffer, sizeof(buffer), "\n------- End of Forwarded Message%s\n",
-		mp->numsel > 1 ? "s" : "");
+		PLURALS(mp->numsel));
     }
     if (write (out, buffer, strlen (buffer)) < 0) {
 	advise (drft, "write");
@@ -659,7 +657,7 @@ copy_mime_draft (int out)
     char buffer[BUFSIZ];
 
     snprintf (buffer, sizeof(buffer), "#forw [forwarded message%s] +%s",
-	mp->numsel == 1 ? "" : "s", mp->foldpath);
+	PLURALS(mp->numsel), mp->foldpath);
     if (write (out, buffer, strlen (buffer)) < 0) {
 	advise (drft, "write");
     }