Merge pull request #7947 from ahorek/fnmatch

headius · web-flow · commit bcdf196e19ec · 2023-10-05T00:44:51.000-05:00
fnmatch not matching glob syntax
diff --git a/core/src/main/java/org/jruby/util/Dir.java b/core/src/main/java/org/jruby/util/Dir.java
@@ -124,7 +124,17 @@ int helper(byte[] pbytes, int pend, byte[] sbytes, int send, Encoding enc) {
                 while (true) {
                     // in place of expected C null char check that falls into default in switch below
                     if (p >= pend) {
-                        return isEnd(sbytes, s, send) ? 0 : FNM_NOMATCH;
+                        if (isEnd(sbytes, s, send)) {
+                          return 0;
+                        }
+                        // failed
+                        if (ptmp != -1 && stmp != -1) {
+                          p = ptmp;
+                          stmp++; /* !ISEND(*stmp) */
+                          s = stmp;
+                          continue;
+                        }
+                        return FNM_NOMATCH;
                     }
 
                     switch (pbytes[p]) {
diff --git a/spec/ruby/core/file/shared/fnmatch.rb b/spec/ruby/core/file/shared/fnmatch.rb
@@ -125,6 +125,13 @@
     end
   end
 
+  it "matches wildcard with characters when flags includes FNM_PATHNAME" do
+    File.send(@method, '*a', 'aa', File::FNM_PATHNAME).should == true
+    File.send(@method, 'a*', 'aa', File::FNM_PATHNAME).should == true
+    File.send(@method, 'a*', 'aaa', File::FNM_PATHNAME).should == true
+    File.send(@method, '*a', 'aaa', File::FNM_PATHNAME).should == true
+  end
+
   it "does not match '/' characters with ? or * when flags includes FNM_PATHNAME" do
     File.send(@method, '?', '/', File::FNM_PATHNAME).should == false
     File.send(@method, '*', '/', File::FNM_PATHNAME).should == false
