Skip to content

fix: list non-ascii as octal bytes #436

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

Open
MukundaKatta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: list non-ascii as octal bytes #436

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions src/sed/processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,8 +392,13 @@ fn list(output: &mut OutputBuffer, line: &IOChunk, max_width: usize) -> UResult<
'\t' => Cow::Borrowed(r"\t"),
c if c.is_ascii_control() => Cow::Owned(format!("\\{:03o}", ch as u8)),
c if c == ' ' || c.is_ascii_graphic() => Cow::Borrowed(ch.encode_utf8(&mut char_buff)),
c if (c as u32) <= 0xFFFF => Cow::Owned(format!("\\u{:04X}", c as u32)),
_ => Cow::Owned(format!("\\U{:08X}", ch as u32)),
_ => Cow::Owned(
ch.to_string()
.as_bytes()
.iter()
.map(|b| format!("\\{b:03o}"))
.collect(),
),
};

// See if folding is required before adding out_str and terminator.
Expand Down
9 changes: 9 additions & 0 deletions tests/by-util/test_sed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,15 @@ check_output!(list_ascii, ["-n", "l 60", "input/ascii"]);
check_output!(list_empty, ["-n", "l 60", "input/empty"]);
check_output!(list_unicode, ["l 60", "input/unicode"]);

#[test]
fn list_non_ascii_uses_octal_bytes() {
new_ucmd!()
.arg("l")
.pipe_in("cÃ🧰y\n")
.succeeds()
.stdout_is("c\\303\\203\\360\\237\\247\\260y$\ncÃ🧰y\n");
}

////////////////////////////////////////////////////////////
// In-place editing
#[test]
Expand Down
8 changes: 5 additions & 3 deletions tests/fixtures/sed/output/list_unicode
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Hello World or \u039A\u03B1\u03BB\u03B7\u03BC\u03AD\u03C1\
\u03B1 \u03BA\u03CC\u03C3\u03BC\u03B5 or \u3053\u3093\u306B\
\u3061\u306F \u4E16\u754C \U0001F600$
Hello World or \316\232\316\261\316\273\316\267\316\274\
\316\255\317\201\316\261 \316\272\317\214\317\203\316\274\
\316\265 or \343\201\223\343\202\223\343\201\253\
\343\201\241\343\201\257 \344\270\226\347\225\214 \
\360\237\230\200$
Hello World or Καλημέρα κόσμε or こんにちは 世界 😀
Loading