From: Karel Zak <kzak@redhat.com>
Date: Wed, 10 Sep 2014 10:51:25 +0000 (+0200)
Subject: libfdisk: make yes/no dialogs more robust
X-Git-Tag: v2.26-rc1~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d12903265367101c51d1b47d98a1457d93cd8ed;p=thirdparty%2Futil-linux.git

libfdisk: make yes/no dialogs more robust

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index 5fc4a4d814..ab48303025 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -338,10 +338,18 @@ int ask_callback(struct fdisk_context *cxt, struct fdisk_ask *ask,
 		break;
 	case FDISK_ASKTYPE_YESNO:
 		fputc('\n', stdout);
-		fputs(fdisk_ask_get_query(ask), stdout);
-		rc = get_user_reply(cxt, _(" [Y]es/[N]o: "), buf, sizeof(buf));
-		if (rc == 0)
-			fdisk_ask_yesno_set_result(ask, rpmatch(buf));
+		do {
+			int x;
+			fputs(fdisk_ask_get_query(ask), stdout);
+			rc = get_user_reply(cxt, _(" [Y]es/[N]o: "), buf, sizeof(buf));
+			if (rc)
+				break;
+			x = rpmatch(buf);
+			if (x == 1 || x == 0) {
+				fdisk_ask_yesno_set_result(ask, x);
+				break;
+			}
+		} while(1);
 		DBG(ASK, ul_debug("yes-no ask: reply '%s' [rc=%d]", buf, rc));
 		break;
 	case FDISK_ASKTYPE_STRING:
diff --git a/libfdisk/src/ask.c b/libfdisk/src/ask.c
index eb386ace9c..c6e02f348c 100644
--- a/libfdisk/src/ask.c
+++ b/libfdisk/src/ask.c
@@ -489,7 +489,7 @@ int fdisk_ask_yesno(struct fdisk_context *cxt,
 	if (!rc)
 		rc = fdisk_do_ask(cxt, ask);
 	if (!rc)
-		*result = fdisk_ask_yesno_get_result(ask);
+		*result = fdisk_ask_yesno_get_result(ask) == 1 ? 1 : 0;
 
 	DBG(ASK, ul_debugobj(ask, "result: %d [rc=%d]\n", *result, rc));
 	fdisk_free_ask(ask);