X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8cebca1119664be52f1cbccd0ee052ae0b8c1de0..5fa3d9aa99f952d8ca032f94f9c47b739e2ef7e7:/uip/prompter.c

diff --git a/uip/prompter.c b/uip/prompter.c
index 37f5960b..630ef860 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
@@ -78,7 +76,7 @@ main (int argc, char **argv)
     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 +212,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 +233,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 +249,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 +260,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 +284,7 @@ abort:
 			break;
 		    if (field[0] == 0)
 			break;
- 		    fprintf (out, "%s", field);
+		    fputs(field, out);
 		}
 		break;
 
@@ -298,7 +296,7 @@ abort:
     m_getfld_state_destroy (&gstate);
 
     if (body)
-	printf ("--------\n");
+	puts("--------");
 
     fflush (stdout);
     fclose (in);
@@ -329,9 +327,9 @@ getln (char *buffer, int n)
 {
     int c;
     char *cp;
+    static int quoting = 0;
 
-    cp = buffer;
-    *cp = 0;
+    *buffer = 0;
 
     switch (setjmp (sigenv)) {
 	case OK: 
@@ -347,15 +345,20 @@ getln (char *buffer, int n)
 	    return NOTOK;
     }
 
+    cp = buffer;
+    *cp = 0;
+
     for (;;) {
 	switch (c = getchar ()) {
 	    case EOF: 
+		quoting = 0;
 		clearerr (stdin);
 		longjmp (sigenv, DONE);
 
 	    case '\n': 
-		if (cp[-1] == QUOTE) {
-		    cp[-1] = c;
+		if (quoting) {
+		    *(cp - 1) = c;
+		    quoting = 0;
 		    wtuser = 0;
 		    return 1;
 		}
@@ -365,6 +368,11 @@ getln (char *buffer, int n)
 		return 0;
 
 	    default: 
+		if (c == QUOTE) {
+		    quoting = 1;
+		} else {
+		    quoting = 0;
+		}
 		if (cp < buffer + n)
 		    *cp++ = c;
 		*cp = 0;