From: Theodore Ts'o <tytso@mit.edu>
Date: Wed, 24 Jul 2002 11:42:02 +0000 (-0400)
Subject: util.c (ask_yn, read_a_char): Note when the user has typed ^C,
X-Git-Tag: E2FSPROGS-1.28-WIP-0817~24
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=542867fb705f0c5705365e470f3e3dd097b5bded;p=tools%2Fe2fsprogs.git

util.c (ask_yn, read_a_char): Note when the user has typed ^C,
	and abort processing by longjmp'ing to ctx->abort_loc.
---

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 46d8907..b7ad3f3 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* util.c (ask_yn, read_a_char): Note when the user has typed ^C,
+		and abort processing by longjmp'ing to ctx->abort_loc.
+
 2002-07-23  Theodore Ts'o  <tytso@mit.edu>
 
 	* pass1.c (e2fsck_pass1): If e2fsck is run with -n, don't create
diff --git a/e2fsck/util.c b/e2fsck/util.c
index 19d4685..ec60de0 100644
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -23,7 +23,6 @@
 #include <termios.h>
 #endif
 #include <stdio.h>
-#define read_a_char()	getchar()
 #endif
 
 #ifdef HAVE_MALLOC_H
@@ -32,6 +31,8 @@
 
 #include "e2fsck.h"
 
+e2fsck_t e2fsck_global_ctx;	/* Try your very best not to use this! */
+
 #include <sys/time.h>
 #include <sys/resource.h>
 
@@ -69,6 +70,28 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned int size,
 	return ret;
 }
 
+#ifndef HAVE_CONIO_H
+int read_a_char(void)
+{
+	char	c;
+	int	r;
+	int	fail = 0;
+
+	while(1) {
+		if (e2fsck_global_ctx &&
+		    (e2fsck_global_ctx->flags & E2F_FLAG_CANCEL)) {
+			return 3;
+		}
+		r = read(0, &c, 1);
+		if (r == 1)
+			return c;
+		if (fail++ > 100)
+			break;
+	}
+	return EOF;
+}
+#endif
+
 int ask_yn(const char * string, int def)
 {
 	int		c;
@@ -88,9 +111,9 @@ int ask_yn(const char * string, int def)
 #endif
 
 	if (def == 1)
-		defstr = _("<y>");
+		defstr = _(_("<y>"));
 	else if (def == 0)
-		defstr = _("<n>");
+		defstr = _(_("<n>"));
 	else
 		defstr = _(" (y/n)");
 	printf("%s%s? ", string, defstr);
@@ -98,6 +121,18 @@ int ask_yn(const char * string, int def)
 		fflush (stdout);
 		if ((c = read_a_char()) == EOF)
 			break;
+		if (c == 3) {
+#ifdef HAVE_TERMIOS_H
+			tcsetattr (0, TCSANOW, &termios);
+#endif
+			if (e2fsck_global_ctx &&
+			    e2fsck_global_ctx->flags & E2F_FLAG_SETJMP_OK) {
+				puts("\n");
+				longjmp(e2fsck_global_ctx->abort_loc, 1);
+			}
+			puts(_("cancelled!\n"));
+			return 0;
+		}
 		if (strchr(short_yes, (char) c)) {
 			def = 1;
 			break;
@@ -110,9 +145,9 @@ int ask_yn(const char * string, int def)
 			break;
 	}
 	if (def)
-		printf ("yes\n\n");
+		puts(_("yes\n"));
 	else
-		printf ("no\n\n");
+		puts (_("no\n"));
 #ifdef HAVE_TERMIOS_H
 	tcsetattr (0, TCSANOW, &termios);
 #endif