Skip to content

fnmatch: Fix ** glob not matching forward slash #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ermo merged 1 commit into from
Feb 20, 2026
Merged

fnmatch: Fix ** glob not matching forward slash #703

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions crates/fnmatch/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ enum Fragment {
MatchOne,

/// `*`
MatchAnyExceptForwardSlash,

/// `**`
MatchAny,

/// `\`
Expand Down Expand Up @@ -79,6 +82,10 @@ impl<'a> StringWalker<'a> {
self.index += much;
}

pub fn peek(&self) -> Option<char> {
self.data.get(self.index..self.index + 1).and_then(|s| s.chars().nth(0))
}

/// Find next occurrence of the character, and substring up to it
pub fn substring_to(&self, c: char) -> Option<&'a str> {
// Clone ourselves and search that iterator.
Expand Down Expand Up @@ -161,7 +168,11 @@ fn fragments_from_string(s: &str) -> Result<Vec<Fragment>, Error> {
while let Some(ch) = walker.next() {
let next_token = match ch {
'?' => Some(Fragment::MatchOne),
'*' => Some(Fragment::MatchAny),
'*' if walker.peek() == Some('*') => {
walker.eat(1);
Some(Fragment::MatchAny)
}
'*' => Some(Fragment::MatchAnyExceptForwardSlash),
'\\' => Some(Fragment::BackSlash),
'/' => Some(Fragment::ForwardSlash),
'.' => Some(Fragment::Dot),
Expand Down Expand Up @@ -211,7 +222,8 @@ fn fragment_to_regex_str(fragment: &Fragment) -> (String, Vec<String>) {
let mut groups = vec![];
let string = match fragment {
Fragment::MatchOne => ".".into(),
Fragment::MatchAny => "[^\\/]*".into(),
Fragment::MatchAnyExceptForwardSlash => "[^\\/]*".into(),
Fragment::MatchAny => ".*".into(),
Fragment::BackSlash => "\\".into(),
Fragment::ForwardSlash => "\\/".into(),
Fragment::Dot => "\\.".into(),
Expand Down Expand Up @@ -311,4 +323,10 @@ pub mod path_tests {
let wide = k.match_path("/usr/lib/modules/6.6.67-51.kvm/kernel/net/netfilter/nft_hash.ko.zst");
assert!(wide.is_none());
}

#[test]
fn test_match_any_regex() {
let pattern = "/usr/share/fonts/**/*.ttf".parse::<Pattern>().unwrap();
assert_eq!(pattern.regex.as_str(), r#"^\/usr\/share\/fonts\/.*\/[^\/]*\.ttf$"#);
}
}