From 080998b6ef82dbb09a8fc470f9f28141756042d2 Mon Sep 17 00:00:00 2001 From: Michael Debertol Date: Mon, 16 Aug 2021 00:14:50 +0200 Subject: [PATCH] chmod: pad all file modes to 4 digits --- src/uu/chmod/src/chmod.rs | 4 ++-- tests/by-util/test_chmod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/uu/chmod/src/chmod.rs b/src/uu/chmod/src/chmod.rs index 5108ec924..bdcafc435 100644 --- a/src/uu/chmod/src/chmod.rs +++ b/src/uu/chmod/src/chmod.rs @@ -323,7 +323,7 @@ impl Chmoder { } if self.verbose { show_error!( - "failed to change mode of file '{}' from {:o} ({}) to {:o} ({})", + "failed to change mode of file '{}' from {:04o} ({}) to {:04o} ({})", file.display(), fperm, display_permissions_unix(fperm as mode_t, false), @@ -335,7 +335,7 @@ impl Chmoder { } else { if self.verbose || self.changes { show_error!( - "mode of '{}' changed from {:o} ({}) to {:o} ({})", + "mode of '{}' changed from {:04o} ({}) to {:04o} ({})", file.display(), fperm, display_permissions_unix(fperm as mode_t, false), diff --git a/tests/by-util/test_chmod.rs b/tests/by-util/test_chmod.rs index 186c645e5..5031105f9 100644 --- a/tests/by-util/test_chmod.rs +++ b/tests/by-util/test_chmod.rs @@ -330,8 +330,8 @@ fn test_chmod_recursive() { .arg("a") .arg("z") .succeeds() - .stderr_contains(&"to 333 (-wx-wx-wx)") - .stderr_contains(&"to 222 (-w--w--w-)"); + .stderr_contains(&"to 0333 (-wx-wx-wx)") + .stderr_contains(&"to 0222 (-w--w--w-)"); assert_eq!(at.metadata("z/y").permissions().mode(), 0o100222); assert_eq!(at.metadata("a/a").permissions().mode(), 0o100222);