Merge branch 'main' into feature/nohup_improve_test_coverage

uutils · Jan 20, 2024 · c43d85e · c43d85e
2 parents 0498c16 + 746a7b1
commit c43d85e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
@@ -137,7 +137,7 @@ jobs:
       shell: bash
       run: |
         RUSTDOCFLAGS="-Dwarnings" cargo doc  ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --no-deps --workspace --document-private-items
-    - uses: DavidAnson/markdownlint-cli2-action@v14
+    - uses: DavidAnson/markdownlint-cli2-action@v15
       with:
         fix: "true"
         globs: |

diff --git a/src/uu/tsort/src/tsort.rs b/src/uu/tsort/src/tsort.rs
@@ -32,7 +32,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         stdin_buf = stdin();
         &mut stdin_buf as &mut dyn Read
     } else {
-        file_buf = File::open(Path::new(&input)).map_err_context(|| input.to_string())?;
+        let path = Path::new(&input);
+        if path.is_dir() {
+            return Err(USimpleError::new(
+                1,
+                format!("{}: read error: Is a directory", input),
+            ));
+        }
+        file_buf = File::open(path).map_err_context(|| input.to_string())?;
         &mut file_buf as &mut dyn Read
     });
 

diff --git a/tests/by-util/test_tsort.rs b/tests/by-util/test_tsort.rs
@@ -64,3 +64,12 @@ fn test_multiple_arguments() {
         .fails()
         .stderr_contains("unexpected argument 'invalid_file' found");
 }
+
+#[test]
+fn test_error_on_dir() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    at.mkdir("tsort_test_dir");
+    ucmd.arg("tsort_test_dir")
+        .fails()
+        .stderr_contains("tsort: tsort_test_dir: read error: Is a directory");
+}