From e46ce2947e3a153c4653b88648b2bdded0f031d9 Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Fri, 2 Jul 2021 19:31:16 +0200
Subject: [PATCH] add usage error

---
 src/uucore/src/lib/macros.rs     |  3 ++
 src/uucore/src/lib/mods/error.rs | 50 ++++++++++++++++++++++++++++++++
 src/uucore_procs/src/lib.rs      |  3 ++
 3 files changed, 56 insertions(+)

diff --git a/src/uucore/src/lib/macros.rs b/src/uucore/src/lib/macros.rs
index e4d83e746..6e3a2166f 100644
--- a/src/uucore/src/lib/macros.rs
+++ b/src/uucore/src/lib/macros.rs
@@ -27,6 +27,9 @@ macro_rules! show(
         let e = $err;
         uucore::error::set_exit_code(e.code());
         eprintln!("{}: {}", executable!(), e);
+        if e.usage() {
+            eprintln!("Try '{} --help' for more information.", executable!());
+        }
     })
 );
 
diff --git a/src/uucore/src/lib/mods/error.rs b/src/uucore/src/lib/mods/error.rs
index f13c777b6..ae509ff00 100644
--- a/src/uucore/src/lib/mods/error.rs
+++ b/src/uucore/src/lib/mods/error.rs
@@ -144,6 +144,13 @@ impl UError {
             UError::Custom(e) => e.code(),
         }
     }
+
+    pub fn usage(&self) -> bool {
+        match self {
+            UError::Common(e) => e.usage(),
+            UError::Custom(e) => e.usage(),
+        }
+    }
 }
 
 impl From<UCommonError> for UError {
@@ -220,6 +227,10 @@ pub trait UCustomError: Error {
     fn code(&self) -> i32 {
         1
     }
+
+    fn usage(&self) -> bool {
+        false
+    }
 }
 
 impl From<Box<dyn UCustomError>> for i32 {
@@ -291,6 +302,37 @@ impl UCustomError for USimpleError {
     }
 }
 
+#[derive(Debug)]
+pub struct UUsageError {
+    pub code: i32,
+    pub message: String,
+}
+
+impl UUsageError {
+    #[allow(clippy::new_ret_no_self)]
+    pub fn new(code: i32, message: String) -> UError {
+        UError::Custom(Box::new(Self { code, message }))
+    }
+}
+
+impl Error for UUsageError {}
+
+impl Display for UUsageError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
+        self.message.fmt(f)
+    }
+}
+
+impl UCustomError for UUsageError {
+    fn code(&self) -> i32 {
+        self.code
+    }
+
+    fn usage(&self) -> bool {
+        true
+    }
+}
+
 /// Wrapper type around [`std::io::Error`].
 ///
 /// The messages displayed by [`UIoError`] should match the error messages displayed by GNU
@@ -331,6 +373,10 @@ impl UIoError {
     pub fn code(&self) -> i32 {
         1
     }
+
+    pub fn usage(&self) -> bool {
+        false
+    }
 }
 
 impl Error for UIoError {}
@@ -427,6 +473,10 @@ impl UCommonError {
     pub fn code(&self) -> i32 {
         1
     }
+
+    pub fn usage(&self) -> bool {
+        false
+    }
 }
 
 impl From<UCommonError> for i32 {
diff --git a/src/uucore_procs/src/lib.rs b/src/uucore_procs/src/lib.rs
index 93567a12d..f62e4178e 100644
--- a/src/uucore_procs/src/lib.rs
+++ b/src/uucore_procs/src/lib.rs
@@ -103,6 +103,9 @@ pub fn gen_uumain(_args: TokenStream, stream: TokenStream) -> TokenStream {
                     if s != "" {
                         show_error!("{}", s);
                     }
+                    if e.usage() {
+                        eprintln!("Try '{} --help' for more information.", executable!());
+                    }
                     e.code()
                 }
             }