system/coreutils
system/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-07-24 03:14:22 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #5808 from tertsdiepraam/printf-octal-prefix

Browse source 
`printf`: use 0 instead of 0o as octal prefix
This commit is contained in:
Daniel Hofstetter 2024-01-09 13:38:19 +01:00 committed by GitHub
parent 7dc4afb5cc 9858fef20e
commit cd9863dd29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -141,7 +141,17 @@ impl Formatter for UnsignedInt {
let mut s = match self.variant {
UnsignedIntVariant::Decimal => format!("{x}"),
UnsignedIntVariant::Octal(Prefix::No) => format!("{x:o}"),
UnsignedIntVariant::Octal(Prefix::Yes) => format!("{x:#o}"),
UnsignedIntVariant::Octal(Prefix::Yes) => {
// The prefix that rust uses is `0o`, but GNU uses `0`.
// We also need to take into account that 0 should not be 00
// Since this is an unsigned int, we do not need to take the minus
// sign into account.
if x != 0 {
format!("0{x:o}")
} else {
format!("{x:o}")
}
}
UnsignedIntVariant::Hexadecimal(Case::Lowercase, Prefix::No) => {
format!("{x:x}")
}
@ -487,6 +497,27 @@ fn strip_fractional_zeroes_and_dot(s: &mut String) {
mod test {
use crate::format::num_format::{Case, ForceDecimal};
#[test]
fn unsigned_octal() {
use super::{Formatter, NumberAlignment, Prefix, UnsignedInt, UnsignedIntVariant};
let f = |x| {
let mut s = Vec::new();
UnsignedInt {
variant: UnsignedIntVariant::Octal(Prefix::Yes),
width: 0,
precision: 0,
alignment: NumberAlignment::Left,
}
.fmt(&mut s, x)
.unwrap();
String::from_utf8(s).unwrap()
};
assert_eq!(f(0), "0");
assert_eq!(f(5), "05");
assert_eq!(f(8), "010");
}
#[test]
fn decimal_float() {
use super::format_float_decimal;