Convert wildcard method to match based on OS case sensitivity

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/io/trunk@140647 13f79535-47bb-0310-9956-ffa450edef68

Author: Stephen Colebourne

src/java/org/apache/commons/io/FilenameUtils.java

@@ -79,7 +79,7 @@
  * @author Martin Cooper
  * @author <a href="mailto:jeremias@apache.org">Jeremias Maerki</a>
  * @author Stephen Colebourne
- * @version $Id: FilenameUtils.java,v 1.31 2004/12/04 19:28:40 scolebourne Exp $
+ * @version $Id: FilenameUtils.java,v 1.32 2004/12/10 22:36:56 scolebourne Exp $
  * @since Commons IO 1.1
  */
 public class FilenameUtils {
@@ -824,6 +824,7 @@ public static boolean isExtension(String filename, Collection extensions) {
      * The wildcard matcher uses the characters '?' and '*' to represent a
      * single or multiple wildcard characters.
      * This is the same as often found on Dos/Unix command lines.
+     * The extension check is case sensitive on Unix and case insensitive on Windows.
      * <pre>
      * wildcardMatch("c.txt", "*.txt")      --> true
      * wildcardMatch("c.txt", "*.jpg")      --> false
@@ -837,24 +838,38 @@ public static boolean isExtension(String filename, Collection extensions) {
      * @return true if the filename matches the wilcard string
      */
     public static boolean wildcardMatch(String filename, String wildcardMatcher) {
+        if (filename == null && wildcardMatcher == null) {
+            return true;
+        }
+        if (filename == null || wildcardMatcher == null) {
+            return false;
+        }
+        if (SYSTEM_SEPARATOR == WINDOWS_SEPARATOR) {
+            filename = filename.toLowerCase();
+            wildcardMatcher = wildcardMatcher.toLowerCase();
+        }
         String[] wcs = splitOnTokens(wildcardMatcher);
-  
+        boolean anyChars = false;
         int textIdx = 0;
         int wcsIdx = 0;
-        boolean anyChars = false;
 
         // loop whilst tokens and text left to process
         while (wcsIdx < wcs.length && textIdx < filename.length()) {
 
-            // ? so move to next text char
             if (wcs[wcsIdx].equals("?")) {
+                // ? so move to next text char
                 textIdx++;
-            } else if (!wcs[wcsIdx].equals("*")) {
+                anyChars = false;
+                
+            } else if (wcs[wcsIdx].equals("*")) {
+                // set any chars status
+                anyChars = true;
+                
+            } else {
                 // matching text token
                 if (anyChars) {
                     // any chars then try to locate text token
                     textIdx = filename.indexOf(wcs[wcsIdx], textIdx);
-  
                     if (textIdx == -1) {
                         // token not found
                         return false;
@@ -869,11 +884,9 @@ public static boolean wildcardMatch(String filename, String wildcardMatcher) {
 
                 // matched text token, move text index to end of matched token
                 textIdx += wcs[wcsIdx].length();
+                anyChars = false;
             }
 
-            // set any chars status
-            anyChars = wcs[wcsIdx].equals("*");
-  
             wcsIdx++;
         }
 
@@ -901,24 +914,24 @@ public static boolean wildcardMatch(String filename, String wildcardMatcher) {
     // used by wildcardMatch
     // package level so a unit test may run on this
     static String[] splitOnTokens(String text) {
-        char[] array = text.toCharArray();
         if (text.indexOf("?") == -1 && text.indexOf("*") == -1) {
             return new String[] { text };
         }
 
+        char[] array = text.toCharArray();
         ArrayList list = new ArrayList();
         StringBuffer buffer = new StringBuffer();
         for (int i = 0; i < array.length; i++) {
-            if(array[i] == '?' || array[i] == '*') {
-                if(buffer.length() != 0) {
-                   list.add(buffer.toString());
-                   buffer.setLength(0);
-                }
-                list.add(new String( new char[] { array[i] } ));
-            } else {
-                buffer.append(array[i]);
-            }
-        }
+			if (array[i] == '?' || array[i] == '*') {
+				if (buffer.length() != 0) {
+					list.add(buffer.toString());
+					buffer.setLength(0);
+				}
+				list.add(new String(new char[] { array[i] }));
+			} else {
+				buffer.append(array[i]);
+			}
+		}
         if (buffer.length() != 0) {
             list.add(buffer.toString());
         }

src/test/org/apache/commons/io/FilenameUtilsWildcardTestCase.java

@@ -15,10 +15,14 @@
  */
 package org.apache.commons.io;
 
+import java.io.File;
+
 import junit.framework.TestCase;
 
 public class FilenameUtilsWildcardTestCase extends TestCase {
 
+    private static final boolean WINDOWS = (File.separatorChar == '\\');
+
     public FilenameUtilsWildcardTestCase(String name) {
         super(name);
     }
@@ -28,6 +32,9 @@ public FilenameUtilsWildcardTestCase(String name) {
     //   FilenameUtils.wildcardMatch(String,String)
 
     public void testMatch() {
+        assertEquals(false, FilenameUtils.wildcardMatch(null, "Foo") );
+        assertEquals(false, FilenameUtils.wildcardMatch("Foo", null) );
+        assertEquals(true, FilenameUtils.wildcardMatch(null, null) );
         assertTrue( FilenameUtils.wildcardMatch("Foo", "Foo") );
         assertTrue( FilenameUtils.wildcardMatch("", "") );
         assertTrue( FilenameUtils.wildcardMatch("Foo", "Fo*") );
@@ -39,6 +46,7 @@ public void testMatch() {
         assertTrue( FilenameUtils.wildcardMatch("Adobe Acrobat Installer", "Ad*er") );
         assertTrue( FilenameUtils.wildcardMatch("Foo", "*Foo") );
         assertTrue( FilenameUtils.wildcardMatch("Foo", "Foo*") );
+        assertEquals(WINDOWS,  FilenameUtils.wildcardMatch("FOO", "Foo*") );
     }
 
     public void testSplitOnTokens() {