more handle errors with multiple files

src/uu/more/src/more.rs

@@ -105,29 +105,51 @@
         while let (Some(file), next_file) = (files_iter.next(), files_iter.peek()) {
             let file = Path::new(file);
             if file.is_dir() {
-                terminal::disable_raw_mode().unwrap();
-                return Err(UUsageError::new(
-                    1,
-                    format!("{} is a directory.", file.quote()),
-                ));
+                if length == 1 {
+                    terminal::disable_raw_mode().unwrap();
+                    return Err(UUsageError::new(
+                        1,
+                        format!("{} is a directory.", file.quote()),
+                    ));
+                }
+                buff.push_str(&format!("more: {} is a directory.\n", file.quote()));
+                continue;
             }
             if !file.exists() {
-                terminal::disable_raw_mode().unwrap();
-                return Err(USimpleError::new(
-                    1,
-                    format!("cannot open {}: No such file or directory", file.quote()),
+                if length == 1 {
+                    terminal::disable_raw_mode().unwrap();
+                    return Err(USimpleError::new(
+                        1,
+                        format!("cannot open {}: No such file or directory", file.quote()),
+                    ));
+                }
+                buff.push_str(&format!(
+                    "more: cannot open {}: No such file or directory\n",
+                    file.quote()
                 ));
+                continue;
             }
             let opened_file = match File::open(file) {
                 Err(why) => {
-                    terminal::disable_raw_mode().unwrap();
-                    return Err(USimpleError::new(
-                        1,
-                        format!("cannot open {}: {}", file.quote(), why.kind()),
+                    if length == 1 {
+                        terminal::disable_raw_mode().unwrap();
+                        return Err(USimpleError::new(
+                            1,
+                            format!("cannot open {}: {}", file.quote(), why.kind()),
+                        ));
+                    }
+                    buff.push_str(&format!(
+                        "more: cannot open {}: {}\n",
+                        file.quote(),
+                        why.kind()
                     ));
+                    continue;
                 }
                 Ok(opened_file) => opened_file,
             };
+            if length > 1 {
+                buff.push_str(&MULTI_FILE_TOP_PROMPT.replace("{}", file.to_str().unwrap()));
+            }
             let mut reader = BufReader::new(opened_file);
             reader.read_to_string(&mut buff).unwrap();
             more(
@@ -141,6 +163,9 @@
             buff.clear();
         }
         reset_term(&mut stdout);
+        if !buff.is_empty() {
+            print!("{}", buff);
+        }
     } else if !std::io::stdin().is_terminal() {
         stdin().read_to_string(&mut buff).unwrap();
         let mut stdout = setup_term();

tests/by-util/test_more.rs

@@ -113,3 +113,26 @@
             .stderr_contains("permission denied");
     }
 }
+
+#[test]
+fn test_more_error_on_multiple_files() {
+    if std::io::stdout().is_terminal() {
+        let ts = TestScenario::new("more");
+        ts.fixtures.mkdir_all("folder");
+        ts.fixtures.make_file("file1");
+        ts.ucmd()
+            .arg("folder")
+            .arg("file2")
+            .arg("file1")
+            .succeeds()
+            .stdout_contains("folder")
+            .stdout_contains("file2")
+            .stdout_contains("file1");
+        ts.ucmd()
+            .arg("file2")
+            .arg("file3")
+            .succeeds()
+            .stdout_contains("file2")
+            .stdout_contains("file3");
+    }
+}