uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

od: hex byte offset case fix (#12175)

Browse Source 
* Made hex byte offset lowercase

* Added test based on issue

* Fixed formatting, moved import to local scope

* Fixed failing tests

* Forced no wasi test

* Revert "Forced no wasi test"

This reverts commit 0cd71c69bf.

* Switched linux to unix, to match test_dd

* Removed urandom dependency credit @cakebaker
This commit is contained in:
Max Ambaum
2026-05-07 17:28:46 +02:00
committed by GitHub
parent 48f93aeeca
commit 912471d40a
2 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/od/src/input_offset.rs
+6 -6
View File
@@ -51,8 +51,8 @@ impl InputOffset {
match (self.radix, self.label) {
(Radix::Decimal, None) => format!("{:07}", self.byte_pos),
(Radix::Decimal, Some(l)) => format!("{:07} ({l:07})", self.byte_pos),
(Radix::Hexadecimal, None) => format!("{:06X}", self.byte_pos),
(Radix::Hexadecimal, Some(l)) => format!("{:06X} ({l:06X})", self.byte_pos),
(Radix::Hexadecimal, None) => format!("{:06x}", self.byte_pos),
(Radix::Hexadecimal, Some(l)) => format!("{:06x} ({l:06x})", self.byte_pos),
(Radix::Octal, None) => format!("{:07o}", self.byte_pos),
(Radix::Octal, Some(l)) => format!("{:07o} ({l:07o})", self.byte_pos),
(Radix::NoPrefix, None) => String::new(),
@@ -73,7 +73,7 @@ impl InputOffset {
#[test]
fn test_input_offset() {
let mut sut = InputOffset::new(Radix::Hexadecimal, 10, None);
assert_eq!("00000A", &sut.format_byte_offset());
assert_eq!("00000a", &sut.format_byte_offset());
sut.increase_position(10);
assert_eq!("000014", &sut.format_byte_offset());
@@ -98,16 +98,16 @@ fn test_input_offset() {
#[test]
fn test_input_offset_with_label() {
let mut sut = InputOffset::new(Radix::Hexadecimal, 10, Some(20));
assert_eq!("00000A (000014)", &sut.format_byte_offset());
assert_eq!("00000a (000014)", &sut.format_byte_offset());
sut.increase_position(10);
assert_eq!("000014 (00001E)", &sut.format_byte_offset());
assert_eq!("000014 (00001e)", &sut.format_byte_offset());
// note normally the radix will not change after initialization
sut.set_radix(Radix::Decimal);
assert_eq!("0000020 (0000030)", &sut.format_byte_offset());
sut.set_radix(Radix::Hexadecimal);
assert_eq!("000014 (00001E)", &sut.format_byte_offset());
assert_eq!("000014 (00001e)", &sut.format_byte_offset());
sut.set_radix(Radix::Octal);
assert_eq!("0000024 (0000036)", &sut.format_byte_offset());
tests/by-util/test_od.rs
+18 -1
View File
@@ -689,7 +689,7 @@ fn test_hex_offset() {
00000000 00000000 00000000 00000000
000010 00000000 00000000 00000000 00000000
00000000 00000000 00000000 00000000
00001F
00001f
",
);
@@ -1343,3 +1343,20 @@ fn test_write_error_dev_full() {
.code_is(1)
.stderr_contains("No space left on device");
}
#[test]
fn test_hex_lowercase() {
let input = [0u8; 10];
// Test verifies that the output hex byte offset is in lowercase
new_ucmd!()
.arg("-Ax")
.run_piped_stdin(input)
.success()
.no_stderr()
.stdout_only(unindent(
r"
000000 000000 000000 000000 000000 000000
00000a
",
));
}