Refactor the ls command to use the cli macro

Author: morr0ne

src/bin/ls/main.rs

@@ -6,38 +6,34 @@ use rustix::{
     fs::{Dir, Mode, OFlags, open},
     termios::tcgetwinsize,
 };
-use std::io::{BufWriter, Stdout, Write, stdout};
+use std::io::{self, BufWriter, stdout};
 
-const VERSION: &str = coreutils::version_text!("ls");
-const HELP: &str = coreutils::help_text!("ls");
 const CURRENT_DIR_PATH: &str = ".";
 
 fn main() -> Result {
-    let mut out = BufWriter::new(stdout());
+    let mut stdout = stdout();
     let winsize = get_win_size();
-    let (cfg, help_or_version) =
-        settings::parse_arguments(winsize.ws_col, &mut out, HELP, VERSION)?;
-
-    if !help_or_version {
-        drop(cfg);
-        let fd = open(
-            CURRENT_DIR_PATH,
-            OFlags::DIRECTORY | OFlags::RDONLY,
-            Mode::RUSR,
-        )?;
-
-        let dir = Dir::new(fd)?;
-
-        // bad bad bad
-        // FIXME: do not allocate
-        let names = dir
-            .filter_map(Result::ok)
-            .map(|entry| entry.file_name().to_string_lossy().into_owned())
-            .filter(|entry| !entry.starts_with('.'))
-            .collect::<Vec<_>>();
-
-        print_all(names, out)?;
-    }
+    let _cfg = settings::parse_arguments(winsize.ws_col, &mut stdout)?;
+
+    let fd = open(
+        CURRENT_DIR_PATH,
+        OFlags::DIRECTORY | OFlags::RDONLY,
+        Mode::RUSR,
+    )?;
+
+    let dir = Dir::new(fd)?;
+
+    // bad bad bad
+    // FIXME: do not allocate
+    let names = dir
+        .filter_map(Result::ok)
+        .map(|entry| entry.file_name().to_string_lossy().into_owned())
+        .filter(|entry| !entry.starts_with('.'))
+        .collect::<Vec<_>>();
+
+    let mut stdout = BufWriter::new(stdout);
+
+    print_all(names, &mut stdout)?;
 
     Ok(())
 }
@@ -49,7 +45,7 @@ fn get_win_size() -> rustix::termios::Winsize {
 
 // FIXME: This algorithm to print out lines is incredibly simplistic
 // and slightly worse than the one used in GNU's ls.
-fn print_all(cols: Vec<String>, stdout: BufWriter<Stdout>) -> Result {
+fn print_all<O: io::Write>(cols: Vec<String>, stdout: &mut O) -> Result {
     const MIN_COLUMN_WIDTH: u16 = 3;
 
     let len = cols.len();
@@ -63,7 +59,7 @@ fn print_all(cols: Vec<String>, stdout: BufWriter<Stdout>) -> Result {
     print_into_columns(cols.iter().map(String::as_str), max_cols, stdout)
 }
 
-fn print_into_columns<I>(iter: I, columns: usize, mut stdout: BufWriter<Stdout>) -> Result
+fn print_into_columns<I, O: io::Write>(iter: I, columns: usize, stdout: &mut O) -> Result
 where
     I: IntoIterator<Item: AsRef<str> + core::fmt::Display>,
 {