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 for #561 and code cleanup (#151) 

https://github.com/PowerShell/Win32-OpenSSH/issues/561
This commit is contained in:
bagajjal 2017-05-25 12:41:44 -07:00 committed by Manoj Ampalam
parent 4df71693c2
commit 921aafc728
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/win32compat/misc_internal.h
View File

@ -4,6 +4,8 @@
#define SSH_ASYNC_STDOUT "SSH_ASYNC_STDOUT" #define SSH_ASYNC_STDOUT "SSH_ASYNC_STDOUT"
#define SSH_ASYNC_STDERR "SSH_ASYNC_STDERR" #define SSH_ASYNC_STDERR "SSH_ASYNC_STDERR"
#define IS_INVALID_HANDLE(h) ( ((NULL == h) || (INVALID_HANDLE_VALUE == h)) ? 1 : 0 )
/* removes first '/' for Windows paths that are unix styled. Ex: /c:/ab.cd */ /* removes first '/' for Windows paths that are unix styled. Ex: /c:/ab.cd */
char * sanitized_path(const char *); char * sanitized_path(const char *);

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

@ -1032,18 +1032,18 @@ start_with_pty(wchar_t *command)
/* 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);
if (monitor_thread == INVALID_HANDLE_VALUE) if (IS_INVALID_HANDLE(monitor_thread))
goto cleanup; goto cleanup;
/* disable Ctrl+C hander in this process*/ /* disable Ctrl+C hander in this process*/
SetConsoleCtrlHandler(NULL, TRUE); SetConsoleCtrlHandler(NULL, TRUE);
io_thread = CreateThread(NULL, 0, ProcessPipes, NULL, 0, NULL); io_thread = CreateThread(NULL, 0, ProcessPipes, NULL, 0, NULL);
if (io_thread == INVALID_HANDLE_VALUE) if (IS_INVALID_HANDLE(io_thread))
goto cleanup; goto cleanup;
ux_thread = CreateThread(NULL, 0, ProcessEventQueue, NULL, 0, NULL); ux_thread = CreateThread(NULL, 0, ProcessEventQueue, NULL, 0, NULL);
if (ux_thread == INVALID_HANDLE_VALUE) if (IS_INVALID_HANDLE(ux_thread))
goto cleanup; goto cleanup;
ProcessMessages(NULL); ProcessMessages(NULL);
@ -1051,15 +1051,15 @@ cleanup:
dwStatus = GetLastError(); dwStatus = GetLastError();
if (child != INVALID_HANDLE_VALUE) if (child != INVALID_HANDLE_VALUE)
TerminateProcess(child, 0); TerminateProcess(child, 0);
if (monitor_thread != INVALID_HANDLE_VALUE) { if (!IS_INVALID_HANDLE(monitor_thread)) {
WaitForSingleObject(monitor_thread, INFINITE); WaitForSingleObject(monitor_thread, INFINITE);
CloseHandle(monitor_thread); CloseHandle(monitor_thread);
} }
if (ux_thread != INVALID_HANDLE_VALUE) { if (!IS_INVALID_HANDLE(ux_thread)) {
TerminateThread(ux_thread, S_OK); TerminateThread(ux_thread, S_OK);
CloseHandle(ux_thread); CloseHandle(ux_thread);
} }
if (io_thread != INVALID_HANDLE_VALUE) { if (!IS_INVALID_HANDLE(io_thread)) {
TerminateThread(io_thread, 0); TerminateThread(io_thread, 0);
CloseHandle(io_thread); CloseHandle(io_thread);
} }
@ -1096,6 +1096,8 @@ start_withno_pty(wchar_t *command)
wchar_t cmd[MAX_CMD_LEN]; wchar_t cmd[MAX_CMD_LEN];
SECURITY_ATTRIBUTES sa; SECURITY_ATTRIBUTES sa;
BOOL ret; BOOL ret;
char buf[128];
DWORD rd = 0, wr = 0, i = 0;
pipe_in = GetStdHandle(STD_INPUT_HANDLE); pipe_in = GetStdHandle(STD_INPUT_HANDLE);
pipe_out = GetStdHandle(STD_OUTPUT_HANDLE); pipe_out = GetStdHandle(STD_OUTPUT_HANDLE);
@ -1130,16 +1132,16 @@ start_withno_pty(wchar_t *command)
GOTO_CLEANUP_ON_ERR(wcscat_s(cmd, MAX_CMD_LEN, L" ")); GOTO_CLEANUP_ON_ERR(wcscat_s(cmd, MAX_CMD_LEN, L" "));
GOTO_CLEANUP_ON_ERR(wcscat_s(cmd, MAX_CMD_LEN, command)); GOTO_CLEANUP_ON_ERR(wcscat_s(cmd, MAX_CMD_LEN, command));
} }
GOTO_CLEANUP_ON_FALSE(CreateProcess(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi)); GOTO_CLEANUP_ON_FALSE(CreateProcess(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi));
/* close unwanted handles*/ /* close unwanted handles*/
CloseHandle(child_pipe_read); CloseHandle(child_pipe_read);
child_pipe_read = INVALID_HANDLE_VALUE; child_pipe_read = INVALID_HANDLE_VALUE;
child = pi.hProcess; child = pi.hProcess;
/* monitor child exist */ /* monitor child exist */
monitor_thread = CreateThread(NULL, 0, MonitorChild_nopty, NULL, 0, NULL); monitor_thread = CreateThread(NULL, 0, MonitorChild_nopty, NULL, 0, NULL);
if (monitor_thread == INVALID_HANDLE_VALUE) if (IS_INVALID_HANDLE(monitor_thread))
goto cleanup; goto cleanup;
/* disable Ctrl+C hander in this process*/ /* disable Ctrl+C hander in this process*/
@ -1147,9 +1149,8 @@ start_withno_pty(wchar_t *command)
/* process data from pipe_in and route appropriately */ /* process data from pipe_in and route appropriately */
while (1) { while (1) {
char buf[128]; rd = wr = i = 0;
DWORD rd = 0, wr = 0, i = 0; GOTO_CLEANUP_ON_FALSE(ReadFile(pipe_in, buf, sizeof(buf)-1, &rd, NULL));
GOTO_CLEANUP_ON_FALSE(ReadFile(pipe_in, buf, 128, &rd, NULL));
while (i < rd) { while (i < rd) {
/* skip arrow keys */ /* skip arrow keys */
@ -1210,10 +1211,16 @@ start_withno_pty(wchar_t *command)
} }
} }
cleanup: cleanup:
if (child != INVALID_HANDLE_VALUE) /* close child's stdin first */
TerminateProcess(child, 0); if(!IS_INVALID_HANDLE(child_pipe_write))
if (monitor_thread != INVALID_HANDLE_VALUE) CloseHandle(child_pipe_write);
if (!IS_INVALID_HANDLE(monitor_thread)) {
WaitForSingleObject(monitor_thread, INFINITE); WaitForSingleObject(monitor_thread, INFINITE);
CloseHandle(monitor_thread);
}
if (!IS_INVALID_HANDLE(child))
TerminateProcess(child, 0);
return child_exit_code; return child_exit_code;
} }
@ -1369,4 +1376,4 @@ wmain(int ac, wchar_t **av)
return start_with_pty(cmd); return start_with_pty(cmd);
else else
return start_withno_pty(cmd); return start_withno_pty(cmd);
} }