From d133ea0b080da30e70408554fab78f429b4a9ea7 Mon Sep 17 00:00:00 2001 From: sarankumar1325 <120080287+sarankumar1325@users.noreply.github.com> Date: Mon, 9 Nov 2026 22:53:57 +0530 Subject: [PATCH 1/2] grep: ignore trailing slashes in --exclude-dir GNU grep 2.19+ treats --exclude-dir=NAME/ the same as --exclude-dir=NAME, because the match is against the directory's bare name. Strip trailing slashes before compiling the exclude-dir glob. Fixes #166 Signed-off-by: sarankumar1325 <120080287+sarankumar1325@users.noreply.github.com> --- src/lib.rs | 8 ++++++++ tests/test_grep.rs | 13 +++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/lib.rs b/src/lib.rs index 7fd4174..9ea138d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -370,6 +370,14 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> { let exclude_dir_globs = { let mut patterns = GlobSet::with_capacity(exclude_dir.len()); for pattern in exclude_dir { + // GNU grep ignores trailing slashes in --exclude-dir (NEWS 2.19), + // because the match is against the directory's bare name. + let normalized = pattern.trim_end_matches('/'); + let pattern = if normalized.is_empty() { + pattern.as_str() + } else { + normalized + }; patterns.add(false, pattern)?; } patterns diff --git a/tests/test_grep.rs b/tests/test_grep.rs index 75961f7..6d94d53 100644 --- a/tests/test_grep.rs +++ b/tests/test_grep.rs @@ -1615,6 +1615,19 @@ fn recursive_with_include_exclude() { .stdout_does_not_contain("b.log"); } +#[test] +fn exclude_dir_ignores_trailing_slashes() { + let (scene, _) = ucmd(); + build_tree(&scene); + for value in ["--exclude-dir=sub/", "--exclude-dir=sub//"] { + let mut c = scene.cmd(env!("CARGO_BIN_EXE_grep")); + c.args(&["-r", "-l", value, "grep", "tree"]) + .succeeds() + .stdout_contains("a.txt") + .stdout_does_not_contain("c.txt"); + } +} + #[test] fn recursive_include_exclude_last_match_wins() { let (scene, _) = ucmd(); From 5de18a0c4a911eba2ba744e959df00e88a72bbe3 Mon Sep 17 00:00:00 2001 From: sarankumar1325 <120080287+sarankumar1325@users.noreply.github.com> Date: Tue, 10 Nov 2026 02:49:37 +0530 Subject: [PATCH 2/2] tests: fold the --exclude-dir trailing slash cases into recursive_with_include_exclude --- tests/test_grep.rs | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/tests/test_grep.rs b/tests/test_grep.rs index 6d94d53..2655346 100644 --- a/tests/test_grep.rs +++ b/tests/test_grep.rs @@ -1593,11 +1593,19 @@ fn recursive_with_include_exclude() { .stdout_contains("a.txt") .stdout_does_not_contain("b.log"); - // exclude-dir filters whole directories. - let mut c = scene.cmd(env!("CARGO_BIN_EXE_grep")); - c.args(&["-r", "-l", "--exclude-dir=sub", "grep", "tree"]) - .succeeds() - .stdout_does_not_contain("c.txt"); + // exclude-dir filters whole directories; like GNU grep, trailing + // slashes in the name are ignored. + for value in [ + "--exclude-dir=sub", + "--exclude-dir=sub/", + "--exclude-dir=sub//", + ] { + let mut c = scene.cmd(env!("CARGO_BIN_EXE_grep")); + c.args(&["-r", "-l", value, "grep", "tree"]) + .succeeds() + .stdout_contains("a.txt") + .stdout_does_not_contain("c.txt"); + } // include + exclude both apply (exclude wins on conflict). let mut c = scene.cmd(env!("CARGO_BIN_EXE_grep")); @@ -1615,19 +1623,6 @@ fn recursive_with_include_exclude() { .stdout_does_not_contain("b.log"); } -#[test] -fn exclude_dir_ignores_trailing_slashes() { - let (scene, _) = ucmd(); - build_tree(&scene); - for value in ["--exclude-dir=sub/", "--exclude-dir=sub//"] { - let mut c = scene.cmd(env!("CARGO_BIN_EXE_grep")); - c.args(&["-r", "-l", value, "grep", "tree"]) - .succeeds() - .stdout_contains("a.txt") - .stdout_does_not_contain("c.txt"); - } -} - #[test] fn recursive_include_exclude_last_match_wins() { let (scene, _) = ucmd();