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..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"));