From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46257)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gang.chen.5i5j@gmail.com>) id 1XDkH8-0006p5-K3
	for qemu-devel@nongnu.org; Sat, 02 Aug 2014 21:07:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gang.chen.5i5j@gmail.com>) id 1XDkGz-00060w-IU
	for qemu-devel@nongnu.org; Sat, 02 Aug 2014 21:07:50 -0400
Message-ID: <53DD8B44.7000206@gmail.com>
Date: Sun, 03 Aug 2014 09:07:16 +0800
From: Chen Gang <gang.chen.5i5j@gmail.com>
MIME-Version: 1.0
References: <53B90C35.6070501@gmail.com> <53DCE92F.3060507@msgid.tls.msk.ru>
In-Reply-To: <53DCE92F.3060507@msgid.tls.msk.ru>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [Qemu-trivial] [PATCH-trivial] qemu-img: Check
 getchar() return value in read_password() for WIN32
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Michael Tokarev <mjt@tls.msk.ru>, Kevin Wolf <kwolf@redhat.com>, stefanha@redhat.com
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org



On 08/02/2014 09:35 PM, Michael Tokarev wrote:
> 06.07.2014 12:43, Chen Gang wrote:
>> 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.
> 
> Applied to -trivial queue, with a slight modification:
> 

Thanks, and I shall continue to make another patches for qemu within
this month.

>> --- 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)) {
> 
> I've added an 'else' there and merged with the previous line,
> to match with the above code which is being added.
> 

OK, thanks.

>>              buf[i++] = c;
>> +        }
>>      }
>>      buf[i] = '\0';
>>      return 0;
> 
> Thanks,
> 
> /mjt
> 

Thanks.
-- 
Chen Gang

Open, share, and attitude like air, water, and life which God blessed