Skip to content

fix(sterm): remove automatic \n to \r\n conversion in write_output #92

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

Merged
ZR233 merged 1 commit into from
Apr 30, 2026
Merged

fix(sterm): remove automatic \n to \r\n conversion in write_output #92

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
18 changes: 11 additions & 7 deletions ostool/src/sterm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,14 +428,8 @@ pub fn encode_key_event(key: KeyEvent) -> io::Result<TerminalAction> {
}

fn write_output(output: &mut impl Write, chunk: &[u8]) -> io::Result<()> {
let mut byte = [0u8; 1];
for &b in chunk {
if b == b'\n' {
byte[0] = b'\r';
output.write_all(&byte)?;
}
byte[0] = b;
output.write_all(&byte)?;
output.write_all(&[b])?;
if b == b'\n' {
output.flush()?;
}
Expand Down Expand Up @@ -748,6 +742,16 @@ mod tests {

write_output(&mut writer, b"line1\nline2").unwrap();

assert_eq!(writer.buf, b"line1\nline2");
assert_eq!(writer.flushes, 2);
}

#[test]
fn write_output_preserves_existing_carriage_returns() {
let mut writer = FlushCountingWriter::new();

write_output(&mut writer, b"line1\r\nline2").unwrap();

assert_eq!(writer.buf, b"line1\r\nline2");
assert_eq!(writer.flushes, 2);
}
Expand Down
Loading