From 2d12903265367101c51d1b47d98a1457d93cd8ed Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 10 Sep 2014 12:51:25 +0200 Subject: libfdisk: make yes/no dialogs more robust Signed-off-by: Karel Zak --- disk-utils/fdisk.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'disk-utils/fdisk.c') diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c index 5fc4a4d81..ab4830302 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: -- cgit v1.2.3-55-g7522