From: Chen Gang Date: Sun, 6 Jul 2014 08:43:33 +0000 (+0800) Subject: qemu-img: Check getchar() return value in read_password() for WIN32 X-Git-Tag: v2.2.0-rc0~178^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdcf6e65bce1f8972030fed7af5e8aa5f6ae92c6;p=thirdparty%2Fqemu.git qemu-img: Check getchar() return value in read_password() for WIN32 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 Signed-off-by: Michael Tokarev --- diff --git a/qemu-img.c b/qemu-img.c index d4518e724f8..19495bb5948 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;