WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #715 from JacobBarthelmeh/examples 

case of non-console ouptut handle
pull/721/head
John Safranek 2024-07-10 11:20:32 -07:00 committed by GitHub
parent bfdcd73eb5 816b314819
commit 0f9e87357b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/wolfssh/wolfssh.c
View File

@ -406,11 +406,10 @@ static THREAD_RET readPeer(void* in)
if (args->rawMode == 0) {
DWORD wrd;
if (GetConsoleMode(stdoutHandle, &wrd) == FALSE) {
err_sys("Unable to get stdout handle");
}
/* depend on the terminal to process VT characters */
/* get console mode will fail on handles that are not a console,
* i.e. if the stdout is being redirected to a file */
if (GetConsoleMode(stdoutHandle, &wrd) != FALSE) {
/* depend on the terminal to process VT characters */
#ifndef _WIN32_WINNT_WIN10
/* support for virtual terminal processing was introduced in windows 10 */
#define _WIN32_WINNT_WIN10 0x0A00
@ -418,8 +417,9 @@ static THREAD_RET readPeer(void* in)
#if defined(WINVER) && (WINVER >= _WIN32_WINNT_WIN10)
wrd |= (ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_PROCESSED_OUTPUT);
#endif
if (SetConsoleMode(stdoutHandle, wrd) == FALSE) {
err_sys("Unable to set console mode");
if (SetConsoleMode(stdoutHandle, wrd) == FALSE) {
err_sys("Unable to set console mode");
}
}
}

28
examples/client/client.c
View File

@ -370,20 +370,20 @@ static THREAD_RET readPeer(void* in)
if (args->rawMode == 0) {
DWORD wrd;
if (GetConsoleMode(stdoutHandle, &wrd) == FALSE) {
err_sys("Unable to get stdout handle");
}
/* depend on the terminal to process VT characters */
#ifndef _WIN32_WINNT_WIN10
/* support for virtual terminal processing was introduced in windows 10 */
#define _WIN32_WINNT_WIN10 0x0A00
#endif
#if defined(WINVER) && (WINVER >= _WIN32_WINNT_WIN10)
wrd |= (ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_PROCESSED_OUTPUT);
#endif
if (SetConsoleMode(stdoutHandle, wrd) == FALSE) {
err_sys("Unable to set console mode");
/* get console mode will fail on handles that are not a console,
* i.e. if the stdout is being redirected to a file */
if (GetConsoleMode(stdoutHandle, &wrd) != FALSE) {
/* depend on the terminal to process VT characters */
#ifndef _WIN32_WINNT_WIN10
/* support for virtual terminal processing was introduced in windows 10 */
#define _WIN32_WINNT_WIN10 0x0A00
#endif
#if defined(WINVER) && (WINVER >= _WIN32_WINNT_WIN10)
wrd |= (ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_PROCESSED_OUTPUT);
#endif
if (SetConsoleMode(stdoutHandle, wrd) == FALSE) {
err_sys("Unable to set console mode");
}
}
}