Merge pull request #2749 from thomasqueirozb/utils_uresult

basename+date+fold+nl+nproc+shuf+uname: use UResult

Author: sylvestre

src/uu/basename/src/basename.rs

@@ -7,11 +7,10 @@
 
 // spell-checker:ignore (ToDO) fullname
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::path::{is_separator, PathBuf};
+use uucore::display::Quotable;
+use uucore::error::{UResult, UUsageError};
 use uucore::InvalidEncodingHandling;
 
 static SUMMARY: &str = "Print NAME with any leading directory components removed
@@ -32,7 +31,8 @@ pub mod options {
     pub static ZERO: &str = "zero";
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -44,12 +44,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     // too few arguments
     if !matches.is_present(options::NAME) {
-        crash!(
-            1,
-            "{1}\nTry '{0} --help' for more information.",
-            uucore::execution_phrase(),
-            "missing operand"
-        );
+        return Err(UUsageError::new(1, "missing operand".to_string()));
     }
 
     let opt_suffix = matches.is_present(options::SUFFIX);
@@ -58,12 +53,18 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let multiple_paths = opt_suffix || opt_multiple;
     // too many arguments
     if !multiple_paths && matches.occurrences_of(options::NAME) > 2 {
-        crash!(
+        return Err(UUsageError::new(
             1,
-            "extra operand '{1}'\nTry '{0} --help' for more information.",
-            uucore::execution_phrase(),
-            matches.values_of(options::NAME).unwrap().nth(2).unwrap()
-        );
+            format!(
+                "extra operand {}",
+                matches
+                    .values_of(options::NAME)
+                    .unwrap()
+                    .nth(2)
+                    .unwrap()
+                    .quote()
+            ),
+        ));
     }
 
     let suffix = if opt_suffix {
@@ -89,7 +90,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         print!("{}{}", basename(path, suffix), line_ending);
     }
 
-    0
+    Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {

src/uu/date/src/date.rs

@@ -18,6 +18,9 @@ use std::fs::File;
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
 use uucore::display::Quotable;
+#[cfg(not(any(target_os = "macos", target_os = "redox")))]
+use uucore::error::FromIo;
+use uucore::error::{UResult, USimpleError};
 use uucore::show_error;
 #[cfg(windows)]
 use winapi::{
@@ -137,7 +140,8 @@ impl<'a> From<&'a str> for Rfc3339Format {
     }
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let syntax = format!(
         "{0} [OPTION]... [+FORMAT]...
  {0} [OPTION]... [MMDDhhmm[[CC]YY][.ss]]",
@@ -147,8 +151,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let format = if let Some(form) = matches.value_of(OPT_FORMAT) {
         if !form.starts_with('+') {
-            show_error!("invalid date {}", form.quote());
-            return 1;
+            return Err(USimpleError::new(
+                1,
+                format!("invalid date {}", form.quote()),
+            ));
         }
         let form = form[1..].to_string();
         Format::Custom(form)
@@ -176,8 +182,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     let set_to = match matches.value_of(OPT_SET).map(parse_date) {
         None => None,
         Some(Err((input, _err))) => {
-            show_error!("invalid date {}", input.quote());
-            return 1;
+            return Err(USimpleError::new(
+                1,
+                format!("invalid date {}", input.quote()),
+            ));
         }
         Some(Ok(date)) => Some(date),
     };
@@ -241,14 +249,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
                     let formatted = date.format(format_string).to_string().replace("%f", "%N");
                     println!("{}", formatted);
                 }
-                Err((input, _err)) => {
-                    show_error!("invalid date {}", input.quote());
-                }
+                Err((input, _err)) => show_error!("invalid date {}", input.quote()),
             }
         }
     }
 
-    0
+    Ok(())
 }
 
 pub fn uu_app() -> App<'static, 'static> {
@@ -348,20 +354,24 @@ fn parse_date<S: AsRef<str> + Clone>(
 }
 
 #[cfg(not(any(unix, windows)))]
-fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
+fn set_system_datetime(_date: DateTime<Utc>) -> UResult<()> {
     unimplemented!("setting date not implemented (unsupported target)");
 }
 
 #[cfg(target_os = "macos")]
-fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
-    show_error!("setting the date is not supported by macOS");
-    1
+fn set_system_datetime(_date: DateTime<Utc>) -> UResult<()> {
+    Err(USimpleError::new(
+        1,
+        "setting the date is not supported by macOS".to_string(),
+    ))
 }
 
 #[cfg(target_os = "redox")]
-fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
-    show_error!("setting the date is not supported by Redox");
-    1
+fn set_system_datetime(_date: DateTime<Utc>) -> UResult<()> {
+    Err(USimpleError::new(
+        1,
+        "setting the date is not supported by Redox".to_string(),
+    ))
 }
 
 #[cfg(all(unix, not(target_os = "macos"), not(target_os = "redox")))]
@@ -370,7 +380,7 @@ fn set_system_datetime(_date: DateTime<Utc>) -> i32 {
 /// https://doc.rust-lang.org/libc/i686-unknown-linux-gnu/libc/fn.clock_settime.html
 /// https://linux.die.net/man/3/clock_settime
 /// https://www.gnu.org/software/libc/manual/html_node/Time-Types.html
-fn set_system_datetime(date: DateTime<Utc>) -> i32 {
+fn set_system_datetime(date: DateTime<Utc>) -> UResult<()> {
     let timespec = timespec {
         tv_sec: date.timestamp() as _,
         tv_nsec: date.timestamp_subsec_nanos() as _,
@@ -379,11 +389,9 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
     let result = unsafe { clock_settime(CLOCK_REALTIME, &timespec) };
 
     if result != 0 {
-        let error = std::io::Error::last_os_error();
-        show_error!("cannot set date: {}", error);
-        error.raw_os_error().unwrap()
+        Err(std::io::Error::last_os_error().map_err_context(|| "cannot set date".to_string()))
     } else {
-        0
+        Ok(())
     }
 }
 
@@ -392,7 +400,7 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
 /// See here for more:
 /// https://docs.microsoft.com/en-us/windows/win32/api/sysinfoapi/nf-sysinfoapi-setsystemtime
 /// https://docs.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-systemtime
-fn set_system_datetime(date: DateTime<Utc>) -> i32 {
+fn set_system_datetime(date: DateTime<Utc>) -> UResult<()> {
     let system_time = SYSTEMTIME {
         wYear: date.year() as WORD,
         wMonth: date.month() as WORD,
@@ -409,10 +417,8 @@ fn set_system_datetime(date: DateTime<Utc>) -> i32 {
     let result = unsafe { SetSystemTime(&system_time) };
 
     if result == 0 {
-        let error = std::io::Error::last_os_error();
-        show_error!("cannot set date: {}", error);
-        error.raw_os_error().unwrap()
+        Err(std::io::Error::last_os_error().map_err_context(|| "cannot set date".to_string()))
     } else {
-        0
+        Ok(())
     }
 }

src/uu/fold/src/fold.rs

@@ -7,13 +7,12 @@
 
 // spell-checker:ignore (ToDOs) ncount routput
 
-#[macro_use]
-extern crate uucore;
-
 use clap::{crate_version, App, Arg};
 use std::fs::File;
 use std::io::{stdin, BufRead, BufReader, Read};
 use std::path::Path;
+use uucore::display::Quotable;
+use uucore::error::{FromIo, UResult, USimpleError};
 use uucore::InvalidEncodingHandling;
 
 const TAB_WIDTH: usize = 8;
@@ -30,7 +29,8 @@ mod options {
     pub const FILE: &str = "file";
 }
 
-pub fn uumain(args: impl uucore::Args) -> i32 {
+#[uucore_procs::gen_uumain]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let args = args
         .collect_str(InvalidEncodingHandling::ConvertLossy)
         .accept_any();
@@ -46,10 +46,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
     };
 
     let width = match poss_width {
-        Some(inp_width) => match inp_width.parse::<usize>() {
-            Ok(width) => width,
-            Err(e) => crash!(1, "illegal width value (\"{}\"): {}", inp_width, e),
-        },
+        Some(inp_width) => inp_width.parse::<usize>().map_err(|e| {
+            USimpleError::new(
+                1,
+                format!("illegal width value ({}): {}", inp_width.quote(), e),
+            )
+        })?,
         None => 80,
     };
 
@@ -58,9 +60,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
         None => vec!["-".to_owned()],
     };
 
-    fold(files, bytes, spaces, width);
-
-    0
+    fold(files, bytes, spaces, width)
 }
 
 pub fn uu_app() -> App<'static, 'static> {
@@ -110,7 +110,7 @@ fn handle_obsolete(args: &[String]) -> (Vec<String>, Option<String>) {
     (args.to_vec(), None)
 }
 
-fn fold(filenames: Vec<String>, bytes: bool, spaces: bool, width: usize) {
+fn fold(filenames: Vec<String>, bytes: bool, spaces: bool, width: usize) -> UResult<()> {
     for filename in &filenames {
         let filename: &str = filename;
         let mut stdin_buf;
@@ -119,16 +119,17 @@ fn fold(filenames: Vec<String>, bytes: bool, spaces: bool, width: usize) {
             stdin_buf = stdin();
             &mut stdin_buf as &mut dyn Read
         } else {
-            file_buf = crash_if_err!(1, File::open(Path::new(filename)));
+            file_buf = File::open(Path::new(filename)).map_err_context(|| filename.to_string())?;
             &mut file_buf as &mut dyn Read
         });
 
         if bytes {
-            fold_file_bytewise(buffer, spaces, width);
+            fold_file_bytewise(buffer, spaces, width)?;
         } else {
-            fold_file(buffer, spaces, width);
+            fold_file(buffer, spaces, width)?;
         }
     }
+    Ok(())
 }
 
 /// Fold `file` to fit `width` (number of columns), counting all characters as
@@ -139,11 +140,15 @@ fn fold(filenames: Vec<String>, bytes: bool, spaces: bool, width: usize) {
 /// to all other characters in the stream.
 ///
 ///  If `spaces` is `true`, attempt to break lines at whitespace boundaries.
-fn fold_file_bytewise<T: Read>(mut file: BufReader<T>, spaces: bool, width: usize) {
+fn fold_file_bytewise<T: Read>(mut file: BufReader<T>, spaces: bool, width: usize) -> UResult<()> {
     let mut line = String::new();
 
     loop {
-        if let Ok(0) = file.read_line(&mut line) {
+        if file
+            .read_line(&mut line)
+            .map_err_context(|| "failed to read line".to_string())?
+            == 0
+        {
             break;
         }
 
@@ -190,6 +195,8 @@ fn fold_file_bytewise<T: Read>(mut file: BufReader<T>, spaces: bool, width: usiz
 
         line.truncate(0);
     }
+
+    Ok(())
 }
 
 /// Fold `file` to fit `width` (number of columns).
@@ -200,7 +207,7 @@ fn fold_file_bytewise<T: Read>(mut file: BufReader<T>, spaces: bool, width: usiz
 ///
 /// If `spaces` is `true`, attempt to break lines at whitespace boundaries.
 #[allow(unused_assignments)]
-fn fold_file<T: Read>(mut file: BufReader<T>, spaces: bool, width: usize) {
+fn fold_file<T: Read>(mut file: BufReader<T>, spaces: bool, width: usize) -> UResult<()> {
     let mut line = String::new();
     let mut output = String::new();
     let mut col_count = 0;
@@ -230,7 +237,11 @@ fn fold_file<T: Read>(mut file: BufReader<T>, spaces: bool, width: usize) {
     }
 
     loop {
-        if let Ok(0) = file.read_line(&mut line) {
+        if file
+            .read_line(&mut line)
+            .map_err_context(|| "failed to read line".to_string())?
+            == 0
+        {
             break;
         }
 
@@ -281,4 +292,6 @@ fn fold_file<T: Read>(mut file: BufReader<T>, spaces: bool, width: usize) {
 
         line.truncate(0);
     }
+
+    Ok(())
 }