ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 19:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable console redirection on Windows without starting from a console (#2888)

Browse Source
This commit is contained in:
Segev Finer 2022-02-05 08:51:36 +02:00 committed by GitHub
parent 97b3aaaa3f
commit 84d4a64f47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Main.cpp
View File

@ -12,15 +12,11 @@
/** /**
* @brief Attempt to connect to a parent console and configure outputs. * @brief Attempt to connect to a parent console and configure outputs.
*
* @note Doesn't do anything if the exe wasn't executed from a console.
*/ */
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
static void connectToConsole() static void connectToConsole()
{ {
if (!AttachConsole(ATTACH_PARENT_PROCESS)) { BOOL attached = AttachConsole(ATTACH_PARENT_PROCESS);
return;
}
// Avoid reconfiguring stdin/stderr/stdout if one of them is already connected to a stream. // Avoid reconfiguring stdin/stderr/stdout if one of them is already connected to a stream.
// This can happen when running with stdout/stderr redirected to a file. // This can happen when running with stdout/stderr redirected to a file.
@ -32,12 +28,12 @@ static void connectToConsole()
// _open() after startup. // _open() after startup.
_close(0); _close(0);
freopen("CONIN$", "r+", stdin); freopen(attached ? "CONIN$" : "NUL", "r+", stdin);
} }
if (0 > fileno(stdout)) { if (0 > fileno(stdout)) {
_close(1); _close(1);
if (freopen("CONOUT$", "a+", stdout)) { if (freopen(attached ? "CONOUT$" : "NUL", "a+", stdout)) {
// Avoid buffering stdout/stderr since IOLBF is replaced by IOFBF in Win32. // Avoid buffering stdout/stderr since IOLBF is replaced by IOFBF in Win32.
setvbuf(stdout, nullptr, _IONBF, 0); setvbuf(stdout, nullptr, _IONBF, 0);
} }
@ -45,7 +41,7 @@ static void connectToConsole()
if (0 > fileno(stderr)) { if (0 > fileno(stderr)) {
_close(2); _close(2);
if (freopen("CONOUT$", "a+", stderr)) { if (freopen(attached ? "CONOUT$" : "NUL", "a+", stderr)) {
setvbuf(stderr, nullptr, _IONBF, 0); setvbuf(stderr, nullptr, _IONBF, 0);
} }
} }