From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Mon, 28 Aug 2017 10:31:10 +0000 (+0200)
Subject: fdisk: minor fixes to make readline work
X-Git-Tag: v2.31-rc1~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=306367042565c8ff9caeacfc79b6bf35d7ecd55d;p=thirdparty%2Futil-linux.git

fdisk: minor fixes to make readline work

Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
---

diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index acfbac8878..261d884beb 100644
--- a/disk-utils/fdisk.c
+++ b/disk-utils/fdisk.c
@@ -53,8 +53,6 @@
 # include <linux/blkpg.h>
 #endif
 
-#undef HAVE_LIBREADLINE
-
 int pwipemode = WIPEMODE_AUTO;
 int device_is_used;
 int is_interactive;
@@ -141,7 +139,10 @@ int get_user_reply(const char *prompt, char *buf, size_t bufsz)
 			rl_callback_read_char();
 			if (!reply_running && reply_line) {
 				sz = strlen(reply_line);
-				memcpy(buf, reply_line, min(sz, bufsz));
+				if (sz == 0)
+					buf[0] = '\n';
+				else
+					memcpy(buf, reply_line, min(sz, bufsz));
 				buf[bufsz - 1] = '\0';
 				free(reply_line);
 				reply_line = NULL;