Clarified description of clobber -auto/-suffix per Ralph's suggestion.

[mmh] / sbr / getans.c

diff --git a/sbr/getans.c b/sbr/getans.c
index 173e1b4..3ef01ed 100644 (file)
--- a/sbr/getans.c
+++ b/sbr/getans.c
@@ -11,9 +11,10 @@
 #include <h/signals.h>
 #include <setjmp.h>
 #include <signal.h>
+#include <errno.h>
 
 static char ansbuf[BUFSIZ];
-static jmp_buf sigenv;
+static sigjmp_buf sigenv;
 
 /*
  * static prototypes
@@ -28,7 +29,7 @@ getans (char *prompt, struct swit *ansp)
     SIGNAL_HANDLER istat = NULL;
     char *cp, **cpp;
 
-    if (!(setjmp (sigenv))) {
+    if (!(sigsetjmp(sigenv, 1))) {
        istat = SIGNAL (SIGINT, intrser);
     } else {
        SIGNAL (SIGINT, istat);
@@ -40,8 +41,36 @@ getans (char *prompt, struct swit *ansp)
        fflush (stdout);
        cp = ansbuf;
        while ((i = getchar ()) != '\n') {
-           if (i == EOF)
-               longjmp (sigenv, 1);
+           if (i == EOF) {
+               /*
+                * If we get an EOF, return
+                */
+               if (feof(stdin))
+                   siglongjmp (sigenv, 1);
+
+               /*
+                * For errors, if we get an EINTR that means that we got
+                * a signal and we should retry.  If we get another error,
+                * then just return.
+                */
+
+               else if (ferror(stdin)) {
+                   if (errno == EINTR) {
+                       clearerr(stdin);
+                       continue;
+                   }
+                   fprintf(stderr, "\nError %s during read\n",
+                           strerror(errno));
+                   siglongjmp (sigenv, 1);
+               } else {
+                   /*
+                    * Just for completeness's sake ...
+                    */
+
+                   fprintf(stderr, "\nUnknown problem in getchar()\n");
+                   siglongjmp (sigenv, 1);
+               }
+           }
            if (cp < &ansbuf[sizeof ansbuf - 1])
                *cp++ = i;
        }
@@ -75,5 +104,5 @@ intrser (int i)
     /*
      * should this be siglongjmp?
      */
-    longjmp (sigenv, 1);
+    siglongjmp (sigenv, 1);
 }