X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fprompter.c;h=e42e8df7c93bac10a71484b6c32c409a4cd19555;hb=55eda7c77fdf33b0a7175968471df55e2600379c;hp=03038a6bc25928fd91760f43b5b59f4d9ea59c4e;hpb=fede6e42d81ce34fd5c1bbe7fb2757b281c2573a;p=mmh

diff --git a/uip/prompter.c b/uip/prompter.c
index 03038a6..e42e8df 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -12,6 +12,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <unistd.h>
 
 static struct swit switches[] = {
 #define PREPSW  0
@@ -34,8 +35,8 @@ static struct swit switches[] = {
 };
 
 
-static int wtuser = 0;
-static int sigint = 0;
+volatile sig_atomic_t wtuser = 0;
+volatile sig_atomic_t sigint = 0;
 static jmp_buf sigenv;
 
 /*
@@ -263,23 +264,26 @@ int
 getln(char *buffer, int n)
 {
 	int c;
+	sig_atomic_t psigint;
 	char *cp;
 
 	cp = buffer;
 	*cp = '\0';
 
 	switch (setjmp(sigenv)) {
-	case OK:
+	case 0:
 		wtuser = 1;
+		psigint = sigint;
 		break;
 
-	case DONE:
-		wtuser = 0;
-		return 0;
-
 	default:
 		wtuser = 0;
-		return NOTOK;
+		if (sigint == psigint) {
+			return 0;
+		} else {
+			sigint = psigint;
+			return NOTOK;
+		}
 	}
 
 	for (;;) {
@@ -311,7 +315,8 @@ getln(char *buffer, int n)
 static void
 intrser(int i)
 {
-	if (wtuser)
-		longjmp(sigenv, NOTOK);
+	if (wtuser) {
+		close(STDIN_FILENO);
+	}
 	sigint++;
 }