From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 24 Oct 2016 22:49:11 +0000 (+0100)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/nmh
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/3956385cc6e2101f354c1378ae3bc654eaecec0a?hp=1e7b41c1eaa6895ecacf224eb953747386ebd49c

Merge branch 'master' of git.sv.gnu.org:/srv/git/nmh
---

diff --git a/sbr/print_help.c b/sbr/print_help.c
index 813a1cb2..5374b6b9 100644
--- a/sbr/print_help.c
+++ b/sbr/print_help.c
@@ -31,7 +31,7 @@ print_help (char *str, struct swit *swp, int print_context)
     }
 
     /* and for further info */
-    puts ("");
+    putchar('\n');
     print_intro (stdout, TRUE);
     puts ("\nSee the BUGS section of the nmh(7) man page for more information.");
 }
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 594a4614..a3eec405 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -492,10 +492,10 @@ static void
 litputs(char *s)
 {
 	if (s) {
-		putc('"', stdout);
+		putchar('"');
 		while (*s)
 			litputc(*s++);
-		putc('"', stdout);
+		putchar('"');
 	} else
 		fputs("<nil>", stdout);
 }
@@ -504,30 +504,30 @@ static void
 litputc(char c)
 {
 	if (c & ~ 0177) {
-		putc('M', stdout);
-		putc('-', stdout);
+		putchar('M');
+		putchar('-');
 		c &= 0177;
 	}
 	if (c < 0x20 || c == 0177) {
 		if (c == '\b') {
-			putc('\\', stdout);
-			putc('b', stdout);
+			putchar('\\');
+			putchar('b');
 		} else if (c == '\f') {
-			putc('\\', stdout);
-			putc('f', stdout);
+			putchar('\\');
+			putchar('f');
 		} else if (c == '\n') {
-			putc('\\', stdout);
-			putc('n', stdout);
+			putchar('\\');
+			putchar('n');
 		} else if (c == '\r') {
-			putc('\\', stdout);
-			putc('r', stdout);
+			putchar('\\');
+			putchar('r');
 		} else if (c == '\t') {
-			putc('\\', stdout);
-			putc('t', stdout);
+			putchar('\\');
+			putchar('t');
 		} else {
-			putc('^', stdout);
-			putc(c ^ 0x40, stdout);	/* DEL to ?, others to alpha */
+			putchar('^');
+			putchar(c ^ 0x40);	/* DEL to ?, others to alpha */
 		}
 	} else
-		putc(c, stdout);
+		putchar(c);
 }
diff --git a/uip/fmttest.c b/uip/fmttest.c
index 7d08438b..6d521196 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -1136,10 +1136,10 @@ static void
 litputs(const char *s)
 {
 	if (s) {
-		putc('"', stdout);
+		putchar('"');
 		while (*s)
 			litputc(*s++);
-		putc('"', stdout);
+		putchar('"');
 	} else
 		fputs("<nil>", stdout);
 }
@@ -1151,26 +1151,26 @@ litputc(char c)
 		printf("\\x%02x", (unsigned char) c);
 	} else if (c < 0x20 || c == 0177) {
 		if (c == '\b') {
-			putc('\\', stdout);
-			putc('b', stdout);
+			putchar('\\');
+			putchar('b');
 		} else if (c == '\f') {
-			putc('\\', stdout);
-			putc('f', stdout);
+			putchar('\\');
+			putchar('f');
 		} else if (c == '\n') {
-			putc('\\', stdout);
-			putc('n', stdout);
+			putchar('\\');
+			putchar('n');
 		} else if (c == '\r') {
-			putc('\\', stdout);
-			putc('r', stdout);
+			putchar('\\');
+			putchar('r');
 		} else if (c == '\t') {
-			putc('\\', stdout);
-			putc('t', stdout);
+			putchar('\\');
+			putchar('t');
 		} else {
-			putc('^', stdout);
-			putc(c ^ 0x40, stdout);	/* DEL to ?, others to alpha */
+			putchar('^');
+			putchar(c ^ 0x40);	/* DEL to ?, others to alpha */
 		}
 	} else
-		putc(c, stdout);
+		putchar(c);
 }
 
 /*
diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 8dbc2ecc..e8ce3f36 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -461,7 +461,7 @@ show_content_aux2 (CT ct, int alternate, char *cracked, char *buffer,
 
 	if (strcmp(invo_name, "mhshow") == 0 && ct->c_type == CT_TEXT &&
 	    ct->c_subtype == TEXT_PLAIN && lastchar != '\n') {
-	    putc('\n', stdout);
+	    putchar('\n');
 	}
 
 	fflush(stdout);
diff --git a/uip/new.c b/uip/new.c
index ff9c398b..7a1f2347 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -391,7 +391,7 @@ doit(char *cur, char *folders, char *sequences[])
             if (strcmp(node->n_name, cur) == 0) {
                 puts(" (*: current folder)");
             } else {
-                puts("");
+                putchar('\n');
             }
             fflush(stdout);