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

use windows terminal parsing for VT wolfssh.c

pull/664/head
JacobBarthelmeh 2024-03-06 09:06:28 -07:00
parent e137865ab2
commit 9c7edce644
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/wolfssh/wolfssh.c
View File

@ -404,6 +404,20 @@ static THREAD_RET readPeer(void* in)
FD_SET(fd, &errSet);
#ifdef USE_WINDOWS_API
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 */
wrd |= (ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_PROCESSED_OUTPUT);
if (SetConsoleMode(stdoutHandle, wrd) == FALSE) {
err_sys("Unable to set console mode");
}
}
/* set handle to use for window resize */
wc_LockMutex(&args->lock);
wolfSSH_SetTerminalResizeCtx(args->ssh, stdoutHandle);
@ -482,22 +496,14 @@ static THREAD_RET readPeer(void* in)
}
}
else {
#ifdef USE_WINDOWS_API
DWORD writtn = 0;
#endif
buf[bufSz - 1] = '\0';
#ifdef USE_WINDOWS_API
if (args->rawMode == 0) {
ret = wolfSSH_ConvertConsole(args->ssh, stdoutHandle, buf,
ret);
if (ret != WS_SUCCESS && ret != WS_WANT_READ) {
err_sys("issue with print out");
}
if (ret == WS_WANT_READ) {
ret = 0;
}
}
else {
printf("%s", buf);
fflush(stdout);
if (WriteFile(stdoutHandle, buf, bufSz, &writtn, NULL) == FALSE) {
err_sys("Failed to write to stdout handle");
}
#else
if (write(STDOUT_FILENO, buf, ret) < 0) {