inc/test-eom-align: Fix MMDF-mbox `B' size calculation.

[nmh] / uip / prompter.c

diff --git a/uip/prompter.c b/uip/prompter.c
index ec2ea3fbc764a027392d8c7bb24d71423de30cca..3a51dbe3cad0e1bfffc6070eae203d4ecebb99c7 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -8,8 +8,9 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
+#include "h/done.h"
 #include <h/utils.h>
-#include "../sbr/m_mktemp.h"
+#include "sbr/m_mktemp.h"
 #include <setjmp.h>
 
 #include <termios.h>
@@ -47,7 +48,7 @@ static jmp_buf sigenv;
 /*
  * prototypes
  */
-int getln (char *, int);
+static int getln (char *, int);
 static int chrcnv (char *);
 static void chrdsp (char *, char);
 static void intrser (int);
@@ -64,7 +65,7 @@ main (int argc, char **argv)
     char **arguments, **argp;
     FILE *in, *out;
     char *tmpfil;
-    m_getfld_state_t gstate = 0;
+    m_getfld_state_t gstate;
 
     if (nmh_init(argv[0], 2)) { return 1; }
 
@@ -182,9 +183,10 @@ main (int argc, char **argv)
     /*
      * Loop through the lines of the draft skeleton.
      */
+    gstate = m_getfld_state_init(in);
     for (;;) {
        int fieldsz = sizeof field;
-       switch (state = m_getfld (&gstate, name, field, &fieldsz, in)) {
+       switch (state = m_getfld2(&gstate, name, field, &fieldsz)) {
            case FLD: 
            case FLDPLUS: 
                /*
@@ -201,7 +203,7 @@ main (int argc, char **argv)
                    fprintf (out, "%s:%s", name, field);
                    while (state == FLDPLUS) {
                        fieldsz = sizeof field;
-                       state = m_getfld (&gstate, name, field, &fieldsz, in);
+                       state = m_getfld2(&gstate, name, field, &fieldsz);
                        fputs(field, stdout);
                        fputs(field, out);
                    }
@@ -242,7 +244,7 @@ abort:
                    puts("--------");
                if (field[0]) {
                    if (prepend && body) {
-                       printf ("\n--------Enter initial text\n\n");
+                       puts("\n--------Enter initial text\n");
                        fflush (stdout);
                        for (;;) {
                            getln (buffer, sizeof(buffer));
@@ -260,11 +262,10 @@ abort:
                            fputs(field, stdout);
                    } while (state == BODY &&
                            (fieldsz = sizeof field,
-                            state = m_getfld (&gstate, name, field, &fieldsz, in)));
+                            state = m_getfld2(&gstate, name, field, &fieldsz)));
                    if (prepend || !body)
                        break;
-                   else
-                       printf ("\n--------Enter additional text\n\n");
+                    puts("\n--------Enter additional text\n");
                }
 
                fflush (stdout);
@@ -312,7 +313,7 @@ abort:
 }
 
 
-int
+static int
 getln (char *buffer, int n)
 {
     int c;
@@ -385,7 +386,7 @@ intrser (int i)
 static int
 chrcnv (char *cp)
 {
-    return (*cp != QUOTE ? *cp : m_atoi (++cp));
+    return *cp != QUOTE ? *cp : m_atoi(++cp);
 }