fnmatch: add a test for glibc's Bugzilla bug #12378

* m4/fnmatch.m4: Use gnulib's fnmatch if the system fnmatch
doesn't allow the literal matching of a lone "[" (which is
required by POSIX).
* tests/test-fnmatch.c (main): Check that "[/b" matches itself.

diff --git a/ChangeLog b/ChangeLog
index f5e33cb24915bc4fe50af2c44febe08795b299b3..9654f9f041651dd69ff49c0c3af4a5987443d0dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-12  James Youngman  <jay@gnu.org>
+
+       Add a test for glibc's Bugzilla bug #12378.
+       * m4/fnmatch.m4: Use gnulib's fnmatch if the system fnmatch
+       doesn't allow the literal matching of a lone "[" (which is
+       required by POSIX).
+       * tests/test-fnmatch.c (main): Check that "[/b" matches itself.
+
 2011-05-11  Ulrich Drepper  <drepper@gmail.com>
 
        Sync glibc change fixing Bugzilla bug #12378.

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index c8ed9e74e776b2ba96ca2716456f331c3dbaee43..4ddfbaecc0db4106aed1d4c011ba978404faf8fe 100644 (file)
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -65,6 +65,8 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
               return 1;
             if (!y ("a*", "abc", 0))
               return 1;
+            if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
+              return 1;
             if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
               return 2;
             if (!y ("a\\\\bc", "abc", 0))

diff --git a/tests/test-fnmatch.c b/tests/test-fnmatch.c
index 66f9b1c9bb2c4049f160e3b3bd822fa17f890062..71664a801702778ef48f624c1fec30f80e9828f3 100644 (file)
--- a/tests/test-fnmatch.c
+++ b/tests/test-fnmatch.c
@@ -46,5 +46,11 @@ main ()
   ASSERT (res = fnmatch ("foo\\.txt", "foo.txt", 0) == 0);
   ASSERT (res = fnmatch ("foo\\.txt", "foo.txt", FNM_NOESCAPE) == FNM_NOMATCH);
 
+  /* Verify that an unmatched [ is treated as a literal, as POSIX
+     requires.  This test ensures that glibc Bugzilla bug #12378 stays
+     fixed.
+   */
+  ASSERT (res = fnmatch ("[/b", "[/b", 0) == 0);
+
   return 0;
 }