Re: [PATCH v2 1/3] mingw: adjust is_console() to work with stdin
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 22, 2016, 23:18 UTC
- Message-ID
- <xmqqlgv7eeoe.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <fc3e0d9c-86ea-4a62-6b70-b9cdd67f581a@drbeat.li>
Beat Bolli <dev+git@drbeat.li> writes:
Show 25 quoted lines
>> @@ -84,6 +84,7 @@ static void warn_if_raster_font(void)
>> static int is_console(int fd)
>> {
>> CONSOLE_SCREEN_BUFFER_INFO sbi;
>> + DWORD mode;
>
> Nit: can we move this definition into the block below where it's used?
>
>> HANDLE hcon;
>>
>> static int initialized = 0;
>> @@ -98,7 +99,10 @@ static int is_console(int fd)
>> return 0;
>>
>> /* check if its a handle to a console output screen buffer */
>> - if (!GetConsoleScreenBufferInfo(hcon, &sbi))
>> + if (!fd) {
>
> Right here:
> + DWORD mode;
>
>> + if (!GetConsoleMode(hcon, &mode))
>> + return 0;
>> + } else if (!GetConsoleScreenBufferInfo(hcon, &sbi))
>> return 0;As these patches have been already merged to 'next' a few hours ago as part of today's integration cycle, please make any further refinement (if necessary) as incremental updates.
Thanks.