summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorVaclav Dolezal2017-08-28 12:31:10 +0200
committerVaclav Dolezal2017-08-28 14:03:30 +0200
commit306367042565c8ff9caeacfc79b6bf35d7ecd55d (patch)
tree951d5dc87bd531b2d1c13d373744a70f2a4b748c /disk-utils
parenthwclock: for debugging print startup system time (diff)
downloadkernel-qcow2-util-linux-306367042565c8ff9caeacfc79b6bf35d7ecd55d.tar.gz
kernel-qcow2-util-linux-306367042565c8ff9caeacfc79b6bf35d7ecd55d.tar.xz
kernel-qcow2-util-linux-306367042565c8ff9caeacfc79b6bf35d7ecd55d.zip
fdisk: minor fixes to make readline work
Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/fdisk.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/disk-utils/fdisk.c b/disk-utils/fdisk.c
index acfbac887..261d884be 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;