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 <[email protected]> --- qemu-img.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index c98896b..8423e8e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -185,15 +185,21 @@ 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)) + } + if (i < (buf_size - 1)) { buf[i++] = c; + } } buf[i] = '\0'; return 0; -- 1.7.11.7
