X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/93fc71c182929daf326a9e8d9974ece3817c99c4..afaab789:/uip/prompter.c?ds=sidebyside

diff --git a/uip/prompter.c b/uip/prompter.c
index 304c9a5d..cdab14e3 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -1,6 +1,4 @@
-
-/*
- * prompter.c -- simple prompting editor front-end
+/* prompter.c -- simple prompting editor front-end
  *
  * 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,8 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
+#include <h/utils.h>
+#include "../sbr/m_mktemp.h"
 #include <setjmp.h>
 
 #include <termios.h>
@@ -71,14 +71,14 @@ main (int argc, char **argv)
     int body = 1, prepend = 1, rapid = 0;
     int doteof = 0, fdi, fdo, i, state;
     char *cp, *drft = NULL, *erasep = NULL;
-    char *killp = NULL, name[NAMESZ], field[BUFSIZ];
+    char *killp = NULL, name[NAMESZ], field[NMH_BUFSIZ];
     char buffer[BUFSIZ];
     char **arguments, **argp;
     FILE *in, *out;
     char *tmpfil;
     m_getfld_state_t gstate = 0;
 
-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -214,8 +214,8 @@ main (int argc, char **argv)
 		    while (state == FLDPLUS) {
 			fieldsz = sizeof field;
 			state = m_getfld (&gstate, name, field, &fieldsz, in);
-			printf ("%s", field);
-			fprintf (out, "%s", field);
+			fputs(field, stdout);
+			fputs(field, out);
 		    }
 		} else {
 		    /* Else, get value of header field */
@@ -235,7 +235,7 @@ abort:
 			do {
 			    if (field[0] != ' ' && field[0] != '\t')
 				putc (' ', out);
-			    fprintf (out, "%s", field);
+			    fputs(field, out);
 			} while (i == 1
 				    && (i = getln (field, sizeof(field))) >= 0);
 			if (i == -1)
@@ -251,7 +251,7 @@ abort:
 	            break;
 		fprintf (out, "--------\n");
 		if (field[0] == 0 || !prepend)
-		    printf ("--------\n");
+		    puts("--------");
 		if (field[0]) {
 		    if (prepend && body) {
 			printf ("\n--------Enter initial text\n\n");
@@ -262,14 +262,14 @@ abort:
 				break;
 			    if (buffer[0] == 0)
 				break;
-			    fprintf (out, "%s", buffer);
+			    fputs(buffer, out);
 			}
 		    }
 
 		    do {
-			fprintf (out, "%s", field);
+			fputs(field, out);
 			if (!rapid && !sigint)
-			    printf ("%s", field);
+			    fputs(field, stdout);
 		    } while (state == BODY &&
 			    (fieldsz = sizeof field,
 			     state = m_getfld (&gstate, name, field, &fieldsz, in)));
@@ -286,7 +286,7 @@ abort:
 			break;
 		    if (field[0] == 0)
 			break;
- 		    fprintf (out, "%s", field);
+		    fputs(field, out);
 		}
 		break;
 
@@ -298,7 +298,7 @@ abort:
     m_getfld_state_destroy (&gstate);
 
     if (body)
-	printf ("--------\n");
+	puts("--------");
 
     fflush (stdout);
     fclose (in);
@@ -331,8 +331,7 @@ getln (char *buffer, int n)
     char *cp;
     static int quoting = 0;
 
-    cp = buffer;
-    *cp = 0;
+    *buffer = 0;
 
     switch (setjmp (sigenv)) {
 	case OK: 
@@ -348,6 +347,9 @@ getln (char *buffer, int n)
 	    return NOTOK;
     }
 
+    cp = buffer;
+    *cp = 0;
+
     for (;;) {
 	switch (c = getchar ()) {
 	    case EOF: