cat: bypass clap when possible

Author: FidelSch

src/uu/cat/src/cat.rs

@@ -219,54 +219,79 @@ mod options {
 
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
-    let matches = uucore::clap_localization::handle_clap_result(uu_app(), args)?;
+    let args: Vec<OsString> = args.collect();
+    let mut files: Vec<OsString>;
+    let options;
 
-    let number_mode = if matches.get_flag(options::NUMBER_NONBLANK) {
-        NumberingMode::NonEmpty
-    } else if matches.get_flag(options::NUMBER) {
-        NumberingMode::All
+    if args.len() > 1
+        && args
+            .iter()
+            .skip(1)
+            .all(|a| !a.to_string_lossy().starts_with('-') || a == "-")
+    {
+        // No options, just files.
+        // Skip clap parsing
+        files = args.into_iter().skip(1).collect();
+        if files.is_empty() {
+            files.push(OsString::from("-"));
+        }
+        options = OutputOptions {
+            show_ends: false,
+            number: NumberingMode::None,
+            show_nonprint: false,
+            show_tabs: false,
+            squeeze_blank: false,
+        };
     } else {
-        NumberingMode::None
-    };
+        let matches = uucore::clap_localization::handle_clap_result(uu_app(), args)?;
 
-    let show_nonprint = [
-        options::SHOW_ALL.to_owned(),
-        options::SHOW_NONPRINTING_ENDS.to_owned(),
-        options::SHOW_NONPRINTING_TABS.to_owned(),
-        options::SHOW_NONPRINTING.to_owned(),
-    ]
-    .iter()
-    .any(|v| matches.get_flag(v));
-
-    let show_ends = [
-        options::SHOW_ENDS.to_owned(),
-        options::SHOW_ALL.to_owned(),
-        options::SHOW_NONPRINTING_ENDS.to_owned(),
-    ]
-    .iter()
-    .any(|v| matches.get_flag(v));
-
-    let show_tabs = [
-        options::SHOW_ALL.to_owned(),
-        options::SHOW_TABS.to_owned(),
-        options::SHOW_NONPRINTING_TABS.to_owned(),
-    ]
-    .iter()
-    .any(|v| matches.get_flag(v));
-
-    let squeeze_blank = matches.get_flag(options::SQUEEZE_BLANK);
-    let files: Vec<OsString> = match matches.get_many::<OsString>(options::FILE) {
-        Some(v) => v.cloned().collect(),
-        None => vec![OsString::from("-")],
-    };
+        let number_mode = if matches.get_flag(options::NUMBER_NONBLANK) {
+            NumberingMode::NonEmpty
+        } else if matches.get_flag(options::NUMBER) {
+            NumberingMode::All
+        } else {
+            NumberingMode::None
+        };
 
-    let options = OutputOptions {
-        show_ends,
-        number: number_mode,
-        show_nonprint,
-        show_tabs,
-        squeeze_blank,
-    };
+        let show_nonprint = [
+            options::SHOW_ALL.to_owned(),
+            options::SHOW_NONPRINTING_ENDS.to_owned(),
+            options::SHOW_NONPRINTING_TABS.to_owned(),
+            options::SHOW_NONPRINTING.to_owned(),
+        ]
+        .iter()
+        .any(|v| matches.get_flag(v));
+
+        let show_ends = [
+            options::SHOW_ENDS.to_owned(),
+            options::SHOW_ALL.to_owned(),
+            options::SHOW_NONPRINTING_ENDS.to_owned(),
+        ]
+        .iter()
+        .any(|v| matches.get_flag(v));
+
+        let show_tabs = [
+            options::SHOW_ALL.to_owned(),
+            options::SHOW_TABS.to_owned(),
+            options::SHOW_NONPRINTING_TABS.to_owned(),
+        ]
+        .iter()
+        .any(|v| matches.get_flag(v));
+
+        let squeeze_blank = matches.get_flag(options::SQUEEZE_BLANK);
+        files = match matches.get_many::<OsString>(options::FILE) {
+            Some(v) => v.cloned().collect(),
+            None => vec![OsString::from("-")],
+        };
+
+        options = OutputOptions {
+            show_ends,
+            number: number_mode,
+            show_nonprint,
+            show_tabs,
+            squeeze_blank,
+        };
+    }
     cat_files(&files, &options)
 }