X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/042f5bed7ff3e5b34ff3166951a7b98bf6bbf105..1c332f6117bf1ffbc5e1e1724be23a7f4e56434f:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index 3c9a61e8..44faf725 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -15,6 +15,7 @@
 #include <h/utils.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include "../sbr/m_mktemp.h"
 
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
@@ -1566,18 +1567,16 @@ find_prefix (void)
 }
 
 
-#define	plural(x) (x == 1 ? "" : "s")
-
 static void
 chkadr (void)
 {
     if (badadr && unkadr)
 	die (NULL, "%d address%s unparsable, %d addressee%s undeliverable",
-		badadr, plural (badadr), unkadr, plural (badadr));
+		badadr, PLURALS(badadr), unkadr, PLURALS(badadr));
     if (badadr)
-	die (NULL, "%d address%s unparsable", badadr, plural (badadr));
+	die (NULL, "%d address%s unparsable", badadr, PLURALS(badadr));
     if (unkadr)
-	die (NULL, "%d addressee%s undeliverable", unkadr, plural (unkadr));
+	die (NULL, "%d addressee%s undeliverable", unkadr, PLURALS(unkadr));
 }
 
 
@@ -1988,7 +1987,7 @@ fcc (char *file, char *folder)
 		if (!verbose)
 		    fprintf (stderr, "  %sFcc %s: ",
 			    msgstate == RESENT ? "Resent-" : "", folder);
-		pidstatus (status, verbose ? stdout : stderr, NULL);
+		pidstatus (status, verbose ? stdout : stderr, fileproc);
 	    } else {
 		if (verbose)
 		    puts("folder ok");