Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: prevent PTY output truncation by correctly handling EOF in cache_thread (#84) #85

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

fix: prevent PTY output truncation by correctly handling EOF in cache_thread (#84) #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/pty/base.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,29 +428,38 @@ impl PTYProcess {

let cache_thread = thread::spawn(move || {
let mut read_buf = OsString::new();
let mut eof_reached;
while cache_alive_rx.try_recv().unwrap_or(true) {
if let Ok(Some((length, blocking))) = cache_req_rx.recv() {
let mut pending_read: Option<OsString> = None;

if (length as usize) < read_buf.len() {
if (length as usize) <= read_buf.len() {
pending_read = Some(OsString::new());
}

eof_reached = false;

let out =
match pending_read {
Some(bytes) => Ok(bytes),
None => {
match blocking {
true => {
match reader_out_rx.recv() {
Ok(None) => Err(OsString::from("Standard out reached EOF")),
Ok(None) => {
eof_reached = true;
Ok(OsString::new())
}
Ok(Some(bytes)) => bytes,
Err(_) => Ok(OsString::new())
}
},
false => {
match reader_out_rx.recv_timeout(Duration::from_millis(200)) {
Ok(None) => Err(OsString::from("Standard out reached EOF")),
Ok(None) => {
eof_reached = true;
Ok(OsString::new())
}
Ok(Some(bytes)) => bytes,
Err(_) => Ok(OsString::new())
}
Expand All @@ -467,7 +476,11 @@ impl PTYProcess {
let (left, right) = vec_buf.split_at(to_read);
let to_return = OsString::from_wide(left);
read_buf = OsString::from_wide(right);
cache_resp_tx.send(Ok(to_return)).unwrap();
if eof_reached && to_return.is_empty() && length != 0 {
cache_resp_tx.send(Err(OsString::from("Standard out reached EOF"))).unwrap();
} else {
cache_resp_tx.send(Ok(to_return)).unwrap();
}
},
Err(err) => { cache_resp_tx.send(Err(err)).unwrap(); }
}
Expand Down
Loading