expand: Continue work when one of given files doesn't exist (#5873)

* expand: continues work when one of given files doesn't exist

* fixed test for nonexisting file

src/uu/expand/src/expand.rs

@@ -471,15 +471,21 @@ fn expand(options: &Options) -> UResult<()> {
             set_exit_code(1);
             continue;
         }
-
+        match open(file) {
-        let mut fh = open(file)?;
+            Ok(mut fh) => {
-
+                while match fh.read_until(b'\n', &mut buf) {
-        while match fh.read_until(b'\n', &mut buf) {
+                    Ok(s) => s > 0,
-            Ok(s) => s > 0,
+                    Err(_) => buf.is_empty(),
-            Err(_) => buf.is_empty(),
+                } {
-        } {
+                    expand_line(&mut buf, &mut output, ts, options)
-            expand_line(&mut buf, &mut output, ts, options)
+                        .map_err_context(|| "failed to write output".to_string())?;
-                .map_err_context(|| "failed to write output".to_string())?;
+                }
+            }
+            Err(e) => {
+                show_error!("{}", e);
+                set_exit_code(1);
+                continue;
+            }
         }
     }
     Ok(())

tests/by-util/test_expand.rs

@@ -417,3 +417,12 @@ fn test_expand_directory() {
         .fails()
         .stderr_contains("expand: .: Is a directory");
 }
+
+#[test]
+fn test_nonexisting_file() {
+    new_ucmd!()
+        .args(&["nonexistent", "with-spaces.txt"])
+        .fails()
+        .stderr_contains("expand: nonexistent: No such file or directory")
+        .stdout_contains_line("// !note: file contains significant whitespace");
+}