edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 14:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8226 from Robyt3/Windows-Console-Nul

Browse source 
Fix assertion on Windows when redirecting console output to `nul`
This commit is contained in:
Dennis Felsing 2024-04-18 01:53:18 +00:00 committed by GitHub
parent e142b2d526 3ef00d465e
commit 998d69240c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/base/log.cpp
View file

@ -410,7 +410,13 @@ std::unique_ptr<ILogger> log_logger_stdout()
if(OutputType == FILE_TYPE_CHAR)
{
DWORD OldConsoleMode = 0;
dbg_assert(GetConsoleMode(pOutput, &OldConsoleMode), "GetConsoleMode failure");
if(!GetConsoleMode(pOutput, &OldConsoleMode))
{
// GetConsoleMode can fail with ERROR_INVALID_HANDLE when redirecting output to "nul",
// which is considered a character file but cannot be used as a console.
dbg_assert(GetLastError() == ERROR_INVALID_HANDLE, "GetConsoleMode failure");
return nullptr;
}
const bool Colors = _wgetenv(L"NO_COLOR") == nullptr;
@ -421,7 +427,7 @@ std::unique_ptr<ILogger> log_logger_stdout()
// Try to downgrade mode gracefully when failing to set both.
if(!SetConsoleMode(pOutput, OldConsoleMode | ENABLE_VIRTUAL_TERMINAL_PROCESSING))
{
// Fallback to old, slower Windows logging API, when failung to enable virtual terminal processing.
// Fallback to old, slower Windows logging API, when failing to enable virtual terminal processing.
return std::make_unique<CWindowsConsoleLogger>(pOutput, Colors);
}
}
@ -440,7 +446,7 @@ std::unique_ptr<ILogger> log_logger_stdout()
// We can use the async logger to write to files and pipes
// by converting the HANDLE to an IOHANDLE.
// For pipes there does not seem to be any way to determine
// whether the console support ANSI escape codes.
// whether the console supports ANSI escape codes.
return std::make_unique<CLoggerAsync>(ConvertWindowsHandle(pOutput, _O_APPEND), false, false);
}
else