Skip to content

echo: handle multibyte escape sequences #6803

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
cakebaker merged 10 commits into from
Oct 22, 2024
Merged

echo: handle multibyte escape sequences #6803

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6d8a781
echo: handle multibyte escape sequences
andrewliebenow Oct 20, 2024
5d9fa38
Use concrete type
andrewliebenow Oct 20, 2024
7ab6c01
Fix MSRV issue
andrewliebenow Oct 20, 2024
199c947
Fix non-UTF-8 argument handling
andrewliebenow Oct 20, 2024
711b17a
Fix MSRV issue
andrewliebenow Oct 20, 2024
c46d8af
Fix Clippy violation
andrewliebenow Oct 20, 2024
d1e6d0a
Fix compiler warning
andrewliebenow Oct 21, 2024
4be524a
Address PR comments
andrewliebenow Oct 21, 2024
635f360
Add MSRV TODO comments
andrewliebenow Oct 21, 2024
b4c057e
echo: use stdout_only_bytes instead of stdout_is_bytes
cakebaker Oct 22, 2024
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
Prev Previous commit
Next Next commit
Fix MSRV issue
  • Loading branch information
@andrewliebenow
andrewliebenow committed Oct 20, 2024
commit 7ab6c017a7179c488e51063c9f3226ea57797252
7 changes: 6 additions & 1 deletion src/uu/echo/src/echo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ fn print_escaped(input: &str, output: &mut StdoutLock) -> io::Result<ControlFlow
if let Some(next) = iter.next() {
// For extending lifetime
let sl: [u8; 1_usize];
let sli: [u8; 1_usize];

let unescaped: &[u8] = match next {
'\\' => br"\",
Expand All @@ -108,7 +109,11 @@ fn print_escaped(input: &str, output: &mut StdoutLock) -> io::Result<ControlFlow
br"\x"
}
}
'0' => &[parse_code(&mut iter, Base::Oct).unwrap_or(b'\0')],
'0' => {
sli = [parse_code(&mut iter, Base::Oct).unwrap_or(b'\0')];

&sli
}
c => {
write!(output, "\\{c}")?;

Expand Down