X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d45c3d28d788129428036fd7f26fa417beccd93e..683e0fb1a14da5b9ce7bc5db6e76951d14d79348:/uip/prompter.c diff --git a/uip/prompter.c b/uip/prompter.c index 872d7423..6b540dbc 100644 --- a/uip/prompter.c +++ b/uip/prompter.c @@ -109,10 +109,10 @@ main (int argc, char **argv) snprintf (buffer, sizeof(buffer), "%s [switches] file", invo_name); print_help (buffer, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case ERASESW: if (!(erasep = *argp++) || *erasep == '-') @@ -209,7 +209,8 @@ 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)) { + int fieldsz = sizeof field; + switch (state = m_getfld (state, name, field, &fieldsz, in)) { case FLD: case FLDEOF: case FLDPLUS: @@ -226,8 +227,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 (state, name, field, &fieldsz, in); printf ("%s", field); fprintf (out, "%s", field); } @@ -293,7 +294,8 @@ 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 (state, name, field, &fieldsz, in))); if (prepend || !body) break; else @@ -396,9 +398,7 @@ getln (char *buffer, int n) static void intrser (int i) { -#ifndef RELIABLE_SIGNALS - SIGNAL (SIGINT, intrser); -#endif + NMH_UNUSED (i); if (wtuser) longjmp (sigenv, NOTOK);