From 55cf3716098e1c5977940b0508a740a2d133aede Mon Sep 17 00:00:00 2001
From: Vaclav Dolezal
Date: Tue, 15 Aug 2017 13:08:49 +0200
Subject: fdisk: add wrap_fgets() for getting user input

make function wrapping rl_fgets() and fputs()&fgets() to remove
code duplication in get_user_reply().

Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
---
 disk-utils/fdisk.c | 57 +++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

(limited to 'disk-utils')

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index e8311bc01..d0d58fd67 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -85,6 +85,21 @@ static char *rl_fgets(char *s, int n, FILE *stream, const char *prompt)
 }
 #endif
 
+static char *wrap_fgets(char *s, int n, FILE *stream, const char *prompt)
+{
+#ifdef HAVE_LIBREADLINE
+	if (isatty(STDIN_FILENO)) {
+		return rl_fgets(s, n, stream, prompt);
+	}
+	else
+#endif
+	{
+		fputs(prompt, stream);
+		fflush(stream);
+		return fgets(s, n, stdin);
+	}
+}
+
 int get_user_reply(struct fdisk_context *cxt, const char *prompt,
 			  char *buf, size_t bufsz)
 {
@@ -92,37 +107,17 @@ int get_user_reply(struct fdisk_context *cxt, const char *prompt,
 	size_t sz;
 
 	do {
-#ifdef HAVE_LIBREADLINE
-		if (isatty(STDIN_FILENO)) {
-			if (!rl_fgets(buf, bufsz, stdout, prompt)) {
-				if (fdisk_label_is_changed(fdisk_get_label(cxt, NULL))) {
-					if (rl_fgets(buf, bufsz, stderr,
-							_("\nDo you really want to quit? "))
-							&& !rpmatch(buf))
-						continue;
-				}
-				fdisk_unref_context(cxt);
-				exit(EXIT_FAILURE);
-			} else
-				break;
-		}
-		else
-#endif
-		{
-			fputs(prompt, stdout);
-			fflush(stdout);
-			if (!fgets(buf, bufsz, stdin)) {
-				if (fdisk_label_is_changed(fdisk_get_label(cxt, NULL))) {
-					fprintf(stderr, _("\nDo you really want to quit? "));
-
-					if (fgets(buf, bufsz, stdin) && !rpmatch(buf))
-						continue;
-				}
-				fdisk_unref_context(cxt);
-				exit(EXIT_FAILURE);
-			} else
-				break;
-		}
+		if (!wrap_fgets(buf, bufsz, stdout, prompt)) {
+			if (fdisk_label_is_changed(fdisk_get_label(cxt, NULL))) {
+				if (wrap_fgets(buf, bufsz, stderr,
+						_("\nDo you really want to quit? "))
+						&& !rpmatch(buf))
+					continue;
+			}
+			fdisk_unref_context(cxt);
+			exit(EXIT_FAILURE);
+		} else
+			break;
 	} while (1);
 
 	for (p = buf; *p && !isgraph(*p); p++);	/* get first non-blank */
-- 
cgit v1.2.3-55-g7522