From 0648321d9796fd709adb7a78b169be3859d93dfb Mon Sep 17 00:00:00 2001 From: Marras Antoine Date: Mon, 8 Jan 2024 15:08:18 +0100 Subject: [PATCH] printf: 0x not shown anymore in front of 0 while in alternative mode --- src/uucore/src/lib/features/format/num_format.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/uucore/src/lib/features/format/num_format.rs b/src/uucore/src/lib/features/format/num_format.rs index 325da3ce6..9b7e805f0 100644 --- a/src/uucore/src/lib/features/format/num_format.rs +++ b/src/uucore/src/lib/features/format/num_format.rs @@ -156,13 +156,21 @@ impl Formatter for UnsignedInt { format!("{x:x}") } UnsignedIntVariant::Hexadecimal(Case::Lowercase, Prefix::Yes) => { - format!("{x:#x}") + if x == 0 { + "0".to_string() + } else { + format!("{x:#x}") + } } UnsignedIntVariant::Hexadecimal(Case::Uppercase, Prefix::No) => { format!("{x:X}") } UnsignedIntVariant::Hexadecimal(Case::Uppercase, Prefix::Yes) => { - format!("{x:#X}") + if x == 0 { + "0".to_string() + } else { + format!("{x:#X}") + } } };