a2ps/trunk/a2ps-4.13c-fnmatch-replacement.patch

   1 diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
   2 --- a2ps-4.13.orig/lib/fnmatch.c        2002-03-04 12:46:25 -0600
   3 +++ a2ps-4.13/lib/fnmatch.c     2006-05-27 11:41:15 -0500
   4 @@ -27,18 +27,6 @@
   5  #include <fnmatch.h>
   6  #include <ctype.h>
   7
   8 -
   9 -/* Comment out all this code if we are using the GNU C Library, and are not
  10 -   actually compiling the library itself.  This code is part of the GNU C
  11 -   Library, but also included in many other GNU distributions.  Compiling
  12 -   and linking in this code is a waste when using the GNU C library
  13 -   (especially if it is a shared library).  Rather than having every GNU
  14 -   program understand `configure --with-gnu-libc' and omit the object files,
  15 -   it is simpler to just do this in the source for each such file.  */
  16 -
  17 -#if defined _LIBC || !defined __GNU_LIBRARY__
  18 -
  19 -
  20  # if defined STDC_HEADERS || !defined isascii
  21  #  define ISASCII(c) 1
  22  # else
  23 @@ -52,10 +40,13 @@
  24  extern int errno;
  25  # endif
  26
  27 +/* fnmatch replacement taken from the GNU C Library for systems that
  28 +   provide a broken implementation. */
  29 +
  30  /* Match STRING against the filename pattern PATTERN, returning zero if
  31     it matches, nonzero if not.  */
  32  int
  33 -fnmatch (const char *pattern, const char *string, int flags)
  34 +rpl_fnmatch (const char *pattern, const char *string, int flags)
  35  {
  36    register const char *p = pattern, *n = string;
  37    register char c;
  38 @@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
  39
  40  # undef FOLD
  41  }
  42 -
  43 -#endif /* _LIBC or not __GNU_LIBRARY__.  */