-
Notifications
You must be signed in to change notification settings - Fork 677
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
pty: Add forkpty #1042
Merged
Merged
pty: Add forkpty #1042
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,11 +3,12 @@ use std::path::Path; | |
use std::os::unix::prelude::*; | ||
use tempfile::tempfile; | ||
|
||
use libc::{_exit, STDOUT_FILENO}; | ||
use nix::fcntl::{OFlag, open}; | ||
use nix::pty::*; | ||
use nix::sys::stat; | ||
use nix::sys::termios::*; | ||
use nix::unistd::{write, close}; | ||
use nix::unistd::{write, close, pause}; | ||
|
||
/// Regression test for Issue #659 | ||
/// This is the correct way to explicitly close a `PtyMaster` | ||
|
@@ -100,7 +101,7 @@ fn test_ptsname_unique() { | |
/// this test we perform the basic act of getting a file handle for a connect master/slave PTTY | ||
/// pair. | ||
#[test] | ||
fn test_open_ptty_pair() { | ||
fn test_open_ptty_pair() { | ||
let _m = ::PTSNAME_MTX.lock().expect("Mutex got poisoned by another test"); | ||
|
||
// Open a new PTTY master | ||
|
@@ -201,3 +202,34 @@ fn test_openpty_with_termios() { | |
close(pty.master).unwrap(); | ||
close(pty.slave).unwrap(); | ||
} | ||
|
||
#[test] | ||
fn test_forkpty() { | ||
use nix::unistd::ForkResult::*; | ||
use nix::sys::signal::*; | ||
use nix::sys::wait::wait; | ||
// forkpty calls openpty which uses ptname(3) internally. | ||
let _m0 = ::PTSNAME_MTX.lock().expect("Mutex got poisoned by another test"); | ||
// forkpty spawns a child process | ||
let _m1 = ::FORK_MTX.lock().expect("Mutex got poisoned by another test"); | ||
|
||
let string = "naninani\n"; | ||
let echoed_string = "naninani\r\n"; | ||
let pty = forkpty(None, None).unwrap(); | ||
match pty.fork_result { | ||
Child => { | ||
write(STDOUT_FILENO, string.as_bytes()).unwrap(); | ||
pause(); // we need the child to stay alive until the parent calls read | ||
unsafe { _exit(0); } | ||
}, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In a Rust test, you cannot return from a forked child. That can cause deadlocks. Instead, you must |
||
Parent { child } => { | ||
let mut buf = [0u8; 10]; | ||
assert!(child.as_raw() > 0); | ||
::read_exact(pty.master, &mut buf); | ||
kill(child, SIGTERM).unwrap(); | ||
wait().unwrap(); // keep other tests using generic wait from getting our child | ||
assert_eq!(&buf, echoed_string.as_bytes()); | ||
close(pty.master).unwrap(); | ||
}, | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
libc::forkpty
fails, thenmaster
will be uninitialized here. For that matter, the return value will be wrong, too. You should ensure that it returnsErr
iflibc::forkpty
fails.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Errno::result(res)
should convert to anErr
ifforkpty
fails, and?
on line 320 should propagate the error.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ahh, I didn't see that little
?
.