X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c703902741e0f7ce55f87e48ef0d00901195f1bc..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/prompter.c

diff --git a/uip/prompter.c b/uip/prompter.c
index d950163d..f5332e46 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -10,8 +10,6 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
-#include <errno.h>
-#include <signal.h>
 #include <setjmp.h>
 
 #include <termios.h>
@@ -74,18 +72,13 @@ main (int argc, char **argv)
     int doteof = 0, fdi, fdo, i, state;
     char *cp, *drft = NULL, *erasep = NULL;
     char *killp = NULL, name[NAMESZ], field[BUFSIZ];
-    char buffer[BUFSIZ], tmpfil[BUFSIZ];
+    char buffer[BUFSIZ];
     char **arguments, **argp;
     FILE *in, *out;
-    char *tfile = NULL;
+    char *tmpfil;
+    m_getfld_state_t gstate = 0;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 2)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
@@ -155,10 +148,9 @@ main (int argc, char **argv)
     if ((in = fopen (drft, "r")) == NULL)
 	adios (drft, "unable to open");
 
-    tfile = m_mktemp2(NULL, invo_name, NULL, &out);
-    if (tfile == NULL) adios("prompter", "unable to create temporary file");
-    chmod (tmpfil, 0600);
-    strncpy (tmpfil, tfile, sizeof(tmpfil));
+    if ((tmpfil = m_mktemp2(NULL, invo_name, NULL, &out)) == NULL) {
+	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
 
     /*
      * Are we changing the kill or erase character?
@@ -202,10 +194,10 @@ main (int argc, char **argv)
     /*
      * Loop through the lines of the draft skeleton.
      */
-    for (state = FLD;;) {
-	switch (state = m_getfld (state, name, field, sizeof(field), in)) {
+    for (;;) {
+	int fieldsz = sizeof field;
+	switch (state = m_getfld (&gstate, name, field, &fieldsz, in)) {
 	    case FLD: 
-	    case FLDEOF: 
 	    case FLDPLUS: 
 		/*
 		 * Check if the value of field contains anything
@@ -220,8 +212,8 @@ main (int argc, char **argv)
 		    printf ("%s:%s", name, field);
 		    fprintf (out, "%s:%s", name, field);
 		    while (state == FLDPLUS) {
-			state =
-			    m_getfld (state, name, field, sizeof(field), in);
+			fieldsz = sizeof field;
+			state = m_getfld (&gstate, name, field, &fieldsz, in);
 			printf ("%s", field);
 			fprintf (out, "%s", field);
 		    }
@@ -235,7 +227,7 @@ abort:
 			if (killp || erasep) {
 			    tcsetattr(0, TCSADRAIN, &tio);
 			}
-			unlink (tmpfil);
+			(void) m_unlink (tmpfil);
 			done (1);
 		    }
 		    if (i != 0 || (field[0] != '\n' && field[0] != 0)) {
@@ -251,17 +243,9 @@ abort:
 		    }
 		}
 
-		if (state == FLDEOF) {	/* moby hack */
-		    fprintf (out, "--------\n");
-		    printf ("--------\n");
-		    if (!body)
-			break;
-		    goto no_body;
-		}
 		continue;
 
 	    case BODY: 
-	    case BODYEOF:
 	    case FILEEOF: 
 	        if (!body)
 	            break;
@@ -287,13 +271,14 @@ abort:
 			if (!rapid && !sigint)
 			    printf ("%s", field);
 		    } while (state == BODY &&
-			    (state = m_getfld (state, name, field, sizeof(field), in)));
+			    (fieldsz = sizeof field,
+			     state = m_getfld (&gstate, name, field, &fieldsz, in)));
 		    if (prepend || !body)
 			break;
 		    else
 			printf ("\n--------Enter additional text\n\n");
 		}
-no_body:
+
 		fflush (stdout);
 		for (;;) {
 		    getln (field, sizeof(field));
@@ -310,6 +295,7 @@ no_body:
 	}
 	break;
     }
+    m_getfld_state_destroy (&gstate);
 
     if (body)
 	printf ("--------\n");
@@ -330,7 +316,7 @@ no_body:
     cpydata (fdi, fdo, tmpfil, drft);
     close (fdi);
     close (fdo);
-    unlink (tmpfil);
+    (void) m_unlink (tmpfil);
 
     context_save ();	/* save the context file */
     done (0);
@@ -343,9 +329,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: 
@@ -361,15 +347,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;
 		}
@@ -379,6 +370,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;