Merge pull request #5350 from cakebaker/echo_no_new_line

echo: don't output "\n" if "\c" is encountered
This commit is contained in:
Terts Diepraam 2023-10-03 17:35:58 +02:00 committed by GitHub
commit 9e9701974e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -175,7 +175,7 @@ fn execute(no_newline: bool, escaped: bool, free: &[String]) -> io::Result<()> {
} }
if escaped { if escaped {
if print_escaped(input, &mut output)?.is_break() { if print_escaped(input, &mut output)?.is_break() {
break; return Ok(());
} }
} else { } else {
write!(output, "{input}")?; write!(output, "{input}")?;

View file

@ -122,7 +122,7 @@ fn test_escape_no_further_output() {
new_ucmd!() new_ucmd!()
.args(&["-e", "a\\cb", "c"]) .args(&["-e", "a\\cb", "c"])
.succeeds() .succeeds()
.stdout_only("a\n"); .stdout_only("a");
} }
#[test] #[test]