X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2Fgetans.c;h=befbd9a9249b14ca87ca1267d827de2e97a5d6a0;hb=a485ed478abbd599d8c9aab48934e7a26733ecb1;hp=80eeb7108791496726c442d66f939adc27a23dad;hpb=6c42153ad9362cc676ea66563bf400d7511b3b68;p=mmh diff --git a/sbr/getans.c b/sbr/getans.c index 80eeb71..befbd9a 100644 --- a/sbr/getans.c +++ b/sbr/getans.c @@ -1,9 +1,6 @@ - /* * getans.c -- get an answer from the user and return a string array * - * $Id$ - * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. @@ -26,54 +23,54 @@ static RETSIGTYPE intrser (int); char ** getans (char *prompt, struct swit *ansp) { - int i; - SIGNAL_HANDLER istat; - char *cp, **cpp; + int i; + SIGNAL_HANDLER istat = NULL; + char *cp, **cpp; - if (!(setjmp (sigenv))) { - istat = SIGNAL (SIGINT, intrser); - } else { - SIGNAL (SIGINT, istat); - return NULL; - } - - for (;;) { - printf ("%s", prompt); - fflush (stdout); - cp = ansbuf; - while ((i = getchar ()) != '\n') { - if (i == EOF) - longjmp (sigenv, 1); - if (cp < &ansbuf[sizeof ansbuf - 1]) - *cp++ = i; - } - *cp = '\0'; - if (ansbuf[0] == '?' || cp == ansbuf) { - printf ("Options are:\n"); - print_sw (ALL, ansp, ""); - continue; - } - cpp = brkstring (ansbuf, " ", NULL); - switch (smatch (*cpp, ansp)) { - case AMBIGSW: - ambigsw (*cpp, ansp); - continue; - case UNKWNSW: - printf (" -%s unknown. Hit for help.\n", *cpp); - continue; - default: + if (!(setjmp (sigenv))) { + istat = SIGNAL (SIGINT, intrser); + } else { SIGNAL (SIGINT, istat); - return cpp; + return NULL; + } + + for (;;) { + printf ("%s", prompt); + fflush (stdout); + cp = ansbuf; + while ((i = getchar ()) != '\n') { + if (i == EOF) + longjmp (sigenv, 1); + if (cp < &ansbuf[sizeof ansbuf - 1]) + *cp++ = i; + } + *cp = '\0'; + if (ansbuf[0] == '?' || cp == ansbuf) { + printf ("Options are:\n"); + print_sw (ALL, ansp, "", stdout); + continue; + } + cpp = brkstring (ansbuf, " ", NULL); + switch (smatch (*cpp, ansp)) { + case AMBIGSW: + ambigsw (*cpp, ansp); + continue; + case UNKWNSW: + printf (" -%s unknown. Hit for help.\n", *cpp); + continue; + default: + SIGNAL (SIGINT, istat); + return cpp; + } } - } } static RETSIGTYPE intrser (int i) { - /* - * should this be siglongjmp? - */ - longjmp (sigenv, 1); + /* + * should this be siglongjmp? + */ + longjmp (sigenv, 1); }