tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-26 15:34:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed redundant code in shell-host

Browse Source
This commit is contained in:
Manoj Ampalam 2016-09-28 12:38:57 -07:00
parent 2de04bfe43
commit 6c5f1c6835
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/win32/win32compat/shell-host.c
View File

@ -63,7 +63,6 @@ consoleEvent* head = NULL;
consoleEvent* tail = NULL; consoleEvent* tail = NULL;
BOOL isRedirected = FALSE; BOOL isRedirected = FALSE;
BOOL istty = FALSE;
BOOL bRet = FALSE; BOOL bRet = FALSE;
BOOL bNoScrollRegion = FALSE; BOOL bNoScrollRegion = FALSE;
BOOL bStartup = TRUE; BOOL bStartup = TRUE;
@ -75,8 +74,6 @@ HANDLE child_err = INVALID_HANDLE_VALUE;
HANDLE pipe_in = INVALID_HANDLE_VALUE; HANDLE pipe_in = INVALID_HANDLE_VALUE;
HANDLE pipe_out = INVALID_HANDLE_VALUE; HANDLE pipe_out = INVALID_HANDLE_VALUE;
HANDLE pipe_err = INVALID_HANDLE_VALUE; HANDLE pipe_err = INVALID_HANDLE_VALUE;
HANDLE child_pipe_read = INVALID_HANDLE_VALUE;
HANDLE child_pipe_write = INVALID_HANDLE_VALUE;
HANDLE child = INVALID_HANDLE_VALUE; HANDLE child = INVALID_HANDLE_VALUE;
HANDLE hConsoleBuffer = INVALID_HANDLE_VALUE; HANDLE hConsoleBuffer = INVALID_HANDLE_VALUE;
@ -813,10 +810,6 @@ DWORD WINAPI ProcessPipes(LPVOID p) {
DWORD rd = 0, wr = 0, i = -1; DWORD rd = 0, wr = 0, i = -1;
GOTO_CLEANUP_ON_FALSE(ReadFile(pipe_in, buf, 128, &rd, NULL)); GOTO_CLEANUP_ON_FALSE(ReadFile(pipe_in, buf, 128, &rd, NULL));
if (!istty) { /* no tty, just send it accross */
GOTO_CLEANUP_ON_FALSE(WriteFile(child_pipe_write, buf, rd, &wr, NULL));
continue;
}
bStartup = FALSE; bStartup = FALSE;
@ -1076,12 +1069,6 @@ int wmain(int ac, wchar_t **av) {
memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES)); memset(&sa, 0, sizeof(SECURITY_ATTRIBUTES));
sa.bInheritHandle = TRUE; sa.bInheritHandle = TRUE;
if (!CreatePipe(&child_pipe_read, &child_pipe_write, &sa, 128))
return -1;
/* A console is attached if a tty is requested */
if (!AllocConsole())
istty = TRUE;
/* create job to hold all child processes */ /* create job to hold all child processes */
{ {
@ -1116,9 +1103,8 @@ int wmain(int ac, wchar_t **av) {
if (isRedirected) if (isRedirected)
{ {
/* disable inheritance on child_pipe_write and pipe_in*/ /* disable inheritance on pipe_in*/
GOTO_CLEANUP_ON_FALSE(SetHandleInformation(pipe_in, HANDLE_FLAG_INHERIT, 0)); GOTO_CLEANUP_ON_FALSE(SetHandleInformation(pipe_in, HANDLE_FLAG_INHERIT, 0));
GOTO_CLEANUP_ON_FALSE(SetHandleInformation(child_pipe_write, HANDLE_FLAG_INHERIT, 0));
} }
/*TODO - pick this up from system32*/ /*TODO - pick this up from system32*/
@ -1147,10 +1133,6 @@ int wmain(int ac, wchar_t **av) {
Sleep(1000); Sleep(1000);
} }
/* close unwanted handles*/
CloseHandle(child_pipe_read);
child_pipe_read = INVALID_HANDLE_VALUE;
/* monitor child exist */ /* monitor child exist */
child = pi.hProcess; child = pi.hProcess;
monitor_thread = CreateThread(NULL, 0, MonitorChild, NULL, 0, NULL); monitor_thread = CreateThread(NULL, 0, MonitorChild, NULL, 0, NULL);