X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0a032eea07f6d77ac6ea4d5a39c9491c34358058..afaab789:/uip/forw.c?ds=sidebyside

diff --git a/uip/forw.c b/uip/forw.c
index f4ca981b..8ee8da9b 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -1,5 +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
@@ -10,6 +9,7 @@
 #include <fcntl.h>
 #include <h/tws.h>
 #include <h/utils.h>
+#include "../sbr/m_maildir.h"
 
 
 #define	IFORMAT	"digest-issue-%s"
@@ -247,10 +247,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:
@@ -589,7 +589,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);
 		}
@@ -626,7 +626,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");
@@ -658,7 +658,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");
     }