tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix to https://github.com/PowerShell/Win32-OpenSSH/issues/421 (#43)

This commit is contained in:
Manoj Ampalam 2017-01-06 23:00:27 -08:00 committed by GitHub
parent cfd88df671
commit 9b8902443e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,6 +136,7 @@ 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 = INVALID_HANDLE_VALUE; HANDLE child = INVALID_HANDLE_VALUE;
DWORD child_exit_code = 0;
HANDLE hConsoleBuffer = INVALID_HANDLE_VALUE; HANDLE hConsoleBuffer = INVALID_HANDLE_VALUE;
HANDLE monitor_thread = INVALID_HANDLE_VALUE; HANDLE monitor_thread = INVALID_HANDLE_VALUE;
@ -497,6 +498,7 @@ void SizeWindow(HANDLE hInput) {
DWORD WINAPI MonitorChild(_In_ LPVOID lpParameter) { DWORD WINAPI MonitorChild(_In_ LPVOID lpParameter) {
WaitForSingleObject(child, INFINITE); WaitForSingleObject(child, INFINITE);
GetExitCodeProcess(child, &child_exit_code);
PostThreadMessage(hostThreadId, WM_APPEXIT, 0, 0); PostThreadMessage(hostThreadId, WM_APPEXIT, 0, 0);
return 0; return 0;
} }
@ -1088,8 +1090,7 @@ int start_with_pty(int ac, wchar_t **av) {
Sleep(20); Sleep(20);
while (!AttachConsole(pi.dwProcessId)) while (!AttachConsole(pi.dwProcessId))
{ {
DWORD exit_code; if (GetExitCodeProcess(pi.hProcess, &child_exit_code) && child_exit_code != STILL_ACTIVE)
if (GetExitCodeProcess(pi.hProcess, &exit_code) && exit_code != STILL_ACTIVE)
break; break;
Sleep(100); Sleep(100);
} }
@ -1129,7 +1130,7 @@ cleanup:
FreeConsole(); FreeConsole();
return 0; return child_exit_code;
} }
HANDLE child_pipe_read; HANDLE child_pipe_read;
@ -1138,6 +1139,7 @@ DWORD WINAPI MonitorChild_nopty(
_In_ LPVOID lpParameter _In_ LPVOID lpParameter
) { ) {
WaitForSingleObject(child, INFINITE); WaitForSingleObject(child, INFINITE);
GetExitCodeProcess(child, &child_exit_code);
CloseHandle(pipe_in); CloseHandle(pipe_in);
//printf("XXXX CHILD PROCESS DEAD XXXXX"); //printf("XXXX CHILD PROCESS DEAD XXXXX");
return 0; return 0;
@ -1282,7 +1284,7 @@ cleanup:
TerminateProcess(child, 0); TerminateProcess(child, 0);
if (monitor_thread != INVALID_HANDLE_VALUE) if (monitor_thread != INVALID_HANDLE_VALUE)
WaitForSingleObject(monitor_thread, INFINITE); WaitForSingleObject(monitor_thread, INFINITE);
return 0; return child_exit_code;
} }
int wmain(int ac, wchar_t **av) { int wmain(int ac, wchar_t **av) {