Use Prctl() and ioctl wrapper functions from x/sys/unix #1504
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
|
Rebased on latest master to hopefully fix the shfmt issues which made Travis CI fail. |
dqminh
reviewed
Jul 3, 2017
| @@ -123,8 +123,8 @@ func unlockpt(f *os.File) error { | |||
|
|
|||
| // ptsname retrieves the name of the first available pts for the given master. | |||
| func ptsname(f *os.File) (string, error) { | |||
| var n int32 | |||
| if err := ioctl(f.Fd(), unix.TIOCGPTN, uintptr(unsafe.Pointer(&n))); err != nil { | |||
| n, err := unix.IoctlGetInt(int(f.Fd()), unix.TIOCGPTN) | |||
There was a problem hiding this comment.
Thanks ! Do you also want to make the same changes to https://github.com/containerd/console/blob/master/tc_linux.go ?
There was a problem hiding this comment.
Sure, will look into it and prepare a PR.
|
LGTM. I know we've said this before, but 👍 for doing this work. 😸 |
|
The |
|
It looks like this is actually a bug in |
Merged
Update golang.org/x/sys to get newly added functions and constants which will be used in successive commits. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Use unix.Prctl() instead of manually reimplementing it using unix.RawSyscall. Also use unix.SECCOMP_MODE_FILTER instead of locally defining it. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Use IoctlGetInt and IoctlGetTermios/IoctlSetTermios instead of manually reimplementing them. Because of unlockpt, the ioctl wrapper is still needed as it needs to pass a pointer to a value, which is not supported by any ioctl function in x/sys/unix yet. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
|
Rebased on latest master with shfmt removed. Travis is now happy again 😎 |
|
LGTM |
1 similar comment
|
LGTM |
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.
Update golang.org/x/sys/unix once again to get some more newly added wrapper functions and switch libcontainer to use them instead of manually reimplemented local wrappers.