X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fprompter.c;h=2bcd92a2076602bd96c820766707822deda66a02;hb=d254c5e2ad008f26d5fda43c3f24f0a711c7e851;hp=4d0ce860fef8ea0742b0dc2d10cd41dc2436f2b1;hpb=5a12e4b0477d3ad699f5713682d26079f2792d17;p=mmh

diff --git a/uip/prompter.c b/uip/prompter.c
index 4d0ce86..2bcd92a 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -12,6 +12,10 @@
 #include <errno.h>
 #include <signal.h>
 #include <setjmp.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <sys/stat.h>
+#include <locale.h>
 
 static struct swit switches[] = {
 #define PREPSW  0
@@ -34,8 +38,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,6 +267,7 @@ int
 getln(char *buffer, int n)
 {
 	int c;
+	sig_atomic_t psigint;
 	char *cp;
 
 	cp = buffer;
@@ -271,15 +276,17 @@ getln(char *buffer, int n)
 	switch (setjmp(sigenv)) {
 	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 +318,8 @@ getln(char *buffer, int n)
 static void
 intrser(int i)
 {
-	if (wtuser)
-		longjmp(sigenv, NOTOK);
+	if (wtuser) {
+		close(STDIN_FILENO);
+	}
 	sigint++;
 }