From 45bdca9f167c52fc2681b7484cf4e6705b72d2a5 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Wed, 20 Mar 2024 10:23:33 +0100
Subject: [PATCH 1/2] fmt: replace two magic numbers with consts

---
 src/uu/fmt/src/fmt.rs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs
index 06016f794b..b795ad2772 100644
--- a/src/uu/fmt/src/fmt.rs
+++ b/src/uu/fmt/src/fmt.rs
@@ -21,6 +21,10 @@ mod parasplit;
 const ABOUT: &str = help_about!("fmt.md");
 const USAGE: &str = help_usage!("fmt.md");
 const MAX_WIDTH: usize = 2500;
+const DEFAULT_GOAL: usize = 70;
+const DEFAULT_WIDTH: usize = 75;
+// by default, goal is 93% of width
+const DEFAULT_GOAL_TO_WIDTH_RATIO: usize = 93;
 
 mod options {
     pub const CROWN_MARGIN: &str = "crown-margin";
@@ -39,9 +43,6 @@ mod options {
     pub const FILES: &str = "files";
 }
 
-// by default, goal is 93% of width
-const DEFAULT_GOAL_TO_WIDTH_RATIO: usize = 93;
-
 pub type FileOrStdReader = BufReader<Box<dyn Read + 'static>>;
 pub struct FmtOptions {
     crown: bool,
@@ -103,7 +104,7 @@ impl FmtOptions {
                 let w = (g * 100 / DEFAULT_GOAL_TO_WIDTH_RATIO).max(g + 3);
                 (w, g)
             }
-            (None, None) => (75, 70),
+            (None, None) => (DEFAULT_WIDTH, DEFAULT_GOAL),
         };
         debug_assert!(width >= goal, "GOAL {goal} should not be greater than WIDTH {width} when given {width_opt:?} and {goal_opt:?}.");
 

From 3ad226cf54a06d88952f9c42837b122fef18239b Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Wed, 20 Mar 2024 10:26:11 +0100
Subject: [PATCH 2/2] fmt: show error if goal > default width

---
 src/uu/fmt/src/fmt.rs     |  3 +++
 tests/by-util/test_fmt.rs | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/uu/fmt/src/fmt.rs b/src/uu/fmt/src/fmt.rs
index b795ad2772..7e10c41e7e 100644
--- a/src/uu/fmt/src/fmt.rs
+++ b/src/uu/fmt/src/fmt.rs
@@ -101,6 +101,9 @@ impl FmtOptions {
                 (w, g)
             }
             (None, Some(&g)) => {
+                if g > DEFAULT_WIDTH {
+                    return Err(USimpleError::new(1, "GOAL cannot be greater than WIDTH."));
+                }
                 let w = (g * 100 / DEFAULT_GOAL_TO_WIDTH_RATIO).max(g + 3);
                 (w, g)
             }
diff --git a/tests/by-util/test_fmt.rs b/tests/by-util/test_fmt.rs
index 411ab322cd..8d50023f38 100644
--- a/tests/by-util/test_fmt.rs
+++ b/tests/by-util/test_fmt.rs
@@ -93,6 +93,17 @@ fn test_fmt_goal_too_big() {
     }
 }
 
+#[test]
+fn test_fmt_goal_bigger_than_default_width_of_75() {
+    for param in ["-g", "--goal"] {
+        new_ucmd!()
+            .args(&["one-word-per-line.txt", param, "76"])
+            .fails()
+            .code_is(1)
+            .stderr_is("fmt: GOAL cannot be greater than WIDTH.\n");
+    }
+}
+
 #[test]
 fn test_fmt_invalid_goal() {
     for param in ["-g", "--goal"] {