[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] qemu-img: Check getchar() return value in read_p
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 7/9] qemu-img: Check getchar() return value in read_password() for WIN32 |
Date: |
Sat, 9 Aug 2014 00:39:00 +0400 |
From: Chen Gang <address@hidden>
getchar() is a standard c library function which may return with failure
(e.g. -1), so like another platforms, also need check it under WIN32.
And make the related code match current qemu code styles, too.
Signed-off-by: Chen Gang <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
qemu-img.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index d4518e7..19495bb 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -185,15 +185,20 @@ static int GCC_FMT_ATTR(2, 3) qprintf(bool quiet, const
char *fmt, ...)
static int read_password(char *buf, int buf_size)
{
int c, i;
+
printf("Password: ");
fflush(stdout);
i = 0;
for(;;) {
c = getchar();
- if (c == '\n')
+ if (c < 0) {
+ buf[i] = '\0';
+ return -1;
+ } else if (c == '\n') {
break;
- if (i < (buf_size - 1))
+ } else if (i < (buf_size - 1)) {
buf[i++] = c;
+ }
}
buf[i] = '\0';
return 0;
--
1.7.10.4
- [Qemu-devel] [PULL 0/9] Trivial patches for 2014-08-09, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 6/9] hw/timer: Move extern declaration from .c to .h file, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 4/9] Show length mismatch error is hex, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 8/9] po: Add Chinese translation, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 1/9] hw/timer/imx_*: fix TIMER_MAX clash with system symbol, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 7/9] qemu-img: Check getchar() return value in read_password() for WIN32,
Michael Tokarev <=
- [Qemu-devel] [PULL 5/9] virtio: Move extern declaration to header file, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 3/9] target-i386/cpu.c: Fix two error output indentation, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 9/9] build-sys: Move qapi-{types, visit, event}.o into util-obj-y, Michael Tokarev, 2014/08/08
- [Qemu-devel] [PULL 2/9] l2tpv3 (configure): it is linux-specific, Michael Tokarev, 2014/08/08
- Re: [Qemu-devel] [PULL 0/9] Trivial patches for 2014-08-09, Peter Maydell, 2014/08/15