Re: fnmatch: remove incompatibility between fnmatch-posix and fnmatch-gnu

[Simon Josefsson]

Bruno Haible <address@hidden> writes:

> Simon Josefsson wrote:
>> Please install as far as I'm concerned.
>
> Done. Thanks also for your fnmatch.m4 fix.

I also noticed there were no self-test for fnmatch.  Pushed.

/Simon

>From 19b2a30859ba963627fb42987944efd35599dc75 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Mon, 4 May 2009 08:39:37 +0200
Subject: [PATCH] New module fnmatch-tests.

---
 ChangeLog             |    5 ++++
 modules/fnmatch-tests |    6 +++++
 tests/test-fnmatch.c  |   61 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 72 insertions(+), 0 deletions(-)
 create mode 100644 modules/fnmatch-tests
 create mode 100644 tests/test-fnmatch.c

diff --git a/ChangeLog b/ChangeLog
index 4a212e3..cd32b23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-04  Simon Josefsson  <address@hidden>
+
+       * modules/fnmatch-tests: New module.
+       * tests/test-fnmatch.c: Add.
+
 2009-05-04  Eric Blake  <address@hidden>
 
        maint: make the new no-submodule-changes rule VPATH-safe
diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests
new file mode 100644
index 0000000..f11bfa9
--- /dev/null
+++ b/modules/fnmatch-tests
@@ -0,0 +1,6 @@
+Files:
+tests/test-fnmatch.c
+
+Makefile.am:
+TESTS += test-fnmatch
+check_PROGRAMS += test-fnmatch
diff --git a/tests/test-fnmatch.c b/tests/test-fnmatch.c
new file mode 100644
index 0000000..9d0aaae
--- /dev/null
+++ b/tests/test-fnmatch.c
@@ -0,0 +1,61 @@
+/* Test of fnmatch string matching function.
+   Copyright (C) 2009 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Simon Josefsson <address@hidden>, 2009.  */
+
+#include <config.h>
+
+#include <fnmatch.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define ASSERT(expr)                                                   \
+  do                                                                   \
+    {                                                                  \
+      if (!(expr))                                                     \
+       {                                                               \
+         fprintf (stderr, "%s:%d: assertion failed\n",                 \
+                  __FILE__, __LINE__);                                 \
+         fflush (stderr);                                              \
+         abort ();                                                     \
+       }                                                               \
+    }                                                                  \
+  while (0)
+
+int
+main ()
+{
+  int res;
+
+  ASSERT (res = fnmatch ("", "", 0) == 0);
+
+  ASSERT (res = fnmatch ("*", "", 0) == 0);
+  ASSERT (res = fnmatch ("*", "foo", 0) == 0);
+  ASSERT (res = fnmatch ("*", "bar", 0) == 0);
+  ASSERT (res = fnmatch ("*", "*", 0) == 0);
+  ASSERT (res = fnmatch ("**", "f", 0) == 0);
+  ASSERT (res = fnmatch ("**", "foo.txt", 0) == 0);
+  ASSERT (res = fnmatch ("*.*", "foo.txt", 0) == 0);
+
+  ASSERT (res = fnmatch ("foo*.txt", "foobar.txt", 0) == 0);
+
+  ASSERT (res = fnmatch ("foo.txt", "foo.txt", 0) == 0);
+  ASSERT (res = fnmatch ("foo\\.txt", "foo.txt", 0) == 0);
+  ASSERT (res = fnmatch ("foo\\.txt", "foo.txt", FNM_NOESCAPE) == FNM_NOMATCH);
+
+  return 0;
+}
-- 
1.6.2.4