diff options
| author | Karel Zak <kzak@redhat.com> | 2014-09-10 12:51:25 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2014-10-24 11:10:06 +0200 |
| commit | 0e0003fde09408d2853d2018cec309ec35269fa5 (patch) | |
| tree | 3dd4ba5fe98b504870c6ba5d143c03d32dce3642 | |
| parent | b7fea6e55614eee078c3bf382b1a30f72bff679b (diff) | |
| download | util-linux-0e0003fde09408d2853d2018cec309ec35269fa5.tar.gz | |
libfdisk: make yes/no dialogs more robust
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | disk-utils/fdisk.c | 16 | ||||
| -rw-r--r-- | libfdisk/src/ask.c | 2 |
2 files changed, 13 insertions, 5 deletions
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c index fed7a5745..e74bf1f10 100644 --- a/disk-utils/fdisk.c +++ b/disk-utils/fdisk.c @@ -326,10 +326,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 da5746c68..8465d26ef 100644 --- a/libfdisk/src/ask.c +++ b/libfdisk/src/ask.c @@ -480,7 +480,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); |