Fix to Issue 698 and other misc changes #208
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bingbing8
approved these changes
Sep 21, 2017
contrib/win32/win32compat/termio.c
Outdated
| @@ -107,7 +107,8 @@ ReadThread(_In_ LPVOID lpParameter) | |||
|
|
|||
| if (!ReadFile(WINHANDLE(pio), pio->read_details.buf, | |||
| pio->read_details.buf_size, &read_status.transferred, NULL)) { | |||
| read_status.error = GetLastError(); | |||
| debug4("ReadThread - ReadFile failed %d, io:%p", GetLastError(), pio); | |||
contrib/win32/win32compat/termio.c
Outdated
| @@ -126,7 +127,8 @@ ReadThread(_In_ LPVOID lpParameter) | |||
| } else { | |||
| if (!ReadFile(WINHANDLE(pio), pio->read_details.buf, | |||
| pio->read_details.buf_size, &read_status.transferred, NULL)) { | |||
| read_status.error = GetLastError(); | |||
| debug4("ReadThread - ReadFile failed %d, io:%p", GetLastError(), pio); | |||
contrib/win32/win32compat/termio.c
Outdated
| @@ -209,7 +211,7 @@ WriteThread(_In_ LPVOID lpParameter) | |||
| if (!WriteFile(WINHANDLE(pio), pio->write_details.buf, write_status.to_transfer, | |||
| &write_status.transferred, NULL)) { | |||
| write_status.error = GetLastError(); | |||
| debug("WriteThread - ReadFile WriteFile %d, io:%p", GetLastError(), pio); | |||
| debug4("WriteThread - ReadFile WriteFile %d, io:%p", GetLastError(), pio); | |||
There was a problem hiding this comment.
Remove ReadFile from the mesage. add error:%d
| if (!SetInformationJobObject(job, JobObjectExtendedLimitInformation, &job_info, sizeof(job_info)) || | ||
| !AssignProcessToJobObject(job, GetCurrentProcess())) { | ||
| printf_s("cannot associate job object: %d", GetLastError()); | ||
| return -1; |
There was a problem hiding this comment.
I assume the handle is closed when process exits.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix to PowerShell/Win32-OpenSSH#698 - Create job object, add ssh-shellhost and ensure all its child process and tied to its lifetime.
Other changes include changes to debug* statements in posix adapter that may cause recursion/stack overflow issues.