RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

Merge pull request #8185 from frendsick/fix/printf-hex-zero-padding

Browse source 
printf: Fix formatting hexadecimals with padding
This commit is contained in:
Dorian Péron 2025-06-15 00:42:56 +02:00 • committed by GitHub
commit 625e5eeb09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/uucore/src/lib/features/format/num_format.rs
View file

@ -134,16 +134,14 @@ pub struct UnsignedInt {
}
impl Formatter<u64> for UnsignedInt {
fn fmt(&self, mut writer: impl Write, x: u64) -> std::io::Result<()> {
fn fmt(&self, writer: impl Write, x: u64) -> std::io::Result<()> {
let mut s = match self.variant {
UnsignedIntVariant::Decimal => format!("{x}"),
UnsignedIntVariant::Octal(_) => format!("{x:o}"),
UnsignedIntVariant::Hexadecimal(Case::Lowercase, _) => {
format!("{x:x}")
}
UnsignedIntVariant::Hexadecimal(Case::Uppercase, _) => {
format!("{x:X}")
}
UnsignedIntVariant::Hexadecimal(case, _) => match case {
Case::Lowercase => format!("{x:x}"),
Case::Uppercase => format!("{x:X}"),
},
};
// Zeroes do not get a prefix. An octal value does also not get a
@ -156,12 +154,7 @@ impl Formatter<u64> for UnsignedInt {
};
s = format!("{prefix}{s:0>width$}", width = self.precision);
match self.alignment {
NumberAlignment::Left => write!(writer, "{s:<width$}", width = self.width),
NumberAlignment::RightSpace => write!(writer, "{s:>width$}", width = self.width),
NumberAlignment::RightZero => write!(writer, "{s:0>width$}", width = self.width),
}
write_output(writer, "".to_string(), s, self.width, self.alignment)
}
fn try_from_spec(s: Spec) -> Result<Self, FormatError> {
@ -700,7 +693,14 @@ fn write_output(
}
}
NumberAlignment::RightZero => {
write!(writer, "{sign_indicator}{s:0>remaining_width$}")
// Add the padding after "0x" for hexadecimals
let (prefix, rest) = if s.len() >= 2 && s[..2].eq_ignore_ascii_case("0x") {
(&s[..2], &s[2..])
} else {
("", s.as_str())
};
let remaining_width = remaining_width.saturating_sub(prefix.len());
write!(writer, "{sign_indicator}{prefix}{rest:0>remaining_width$}")
}
}
}
@ -1271,18 +1271,7 @@ mod test {
assert_eq!(f("%#09.e", &(-100.0).into()), "-001.e+02");
assert_eq!(f("%# 9.E", &100.0.into()), " 1.E+02");
assert_eq!(f("% 12.2A", &(-100.0).into()), " -0XC.80P+3");
}
#[test]
#[ignore = "Need issue #7510 to be fixed"]
fn format_float_others_broken() {
// TODO: Merge this back into format_float_others.
let f = |fmt_str: &str, n: &ExtendedBigDecimal| {
let format = Format::<Float, &ExtendedBigDecimal>::parse(fmt_str).unwrap();
fmt(&format, n)
};
// #7510
assert_eq!(f("%012.2a", &(-100.0).into()), "-0x00c.80p+3");
assert_eq!(f("%012.2A", &(-100.0).into()), "-0X00C.80P+3");
}
}

4
tests/by-util/test_printf.rs
View file

@ -906,6 +906,10 @@ fn pad_unsigned_three() {
("%#.3x", "0x003"),
("%#.3X", "0X003"),
("%#.3o", "003"),
("%#05x", "0x003"),
("%#05X", "0X003"),
("%3x", " 3"),
("%3X", " 3"),
] {
new_ucmd!()
.args(&[format, "3"])