[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnulib-bug
Subject:    fnmatch_.h changes to make it match libc better
From:       Paul Eggert <eggert () CS ! UCLA ! EDU>
Date:       2007-01-24 21:47:47
Message-ID: 87r6tk6qrg.fsf () penguin ! cs ! ucla ! edu
[Download RAW message or body]

I installed the following, since I'm trying to get gnulib fnmatch to
match glibc fnmatch more closely.  It affects only white space and comments.

2007-01-24  Paul Eggert  <eggert@cs.ucla.edu>

	* lib/fnmatch_.h: Readjust white space and comments to match
	glibc, to avoid spurious diffs.

--- lib/fnmatch_.h	2 Jun 2005 20:41:05 -0000	1.5
+++ lib/fnmatch_.h	24 Jan 2007 21:46:41 -0000
@@ -1,6 +1,8 @@
 /* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
    2005 Free Software Foundation, Inc.

+   This file is part of the GNU C Library.
+
    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 2, or (at your option)
@@ -16,48 +18,48 @@
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */

 #ifndef	_FNMATCH_H
-# define _FNMATCH_H	1
+#define	_FNMATCH_H	1

-# ifdef	__cplusplus
+#ifdef	__cplusplus
 extern "C" {
-# endif
+#endif

 /* We #undef these before defining them because some losing systems
    (HP-UX A.08.07 for example) define these in <unistd.h>.  */
-# undef	FNM_PATHNAME
-# undef	FNM_NOESCAPE
-# undef	FNM_PERIOD
+#undef	FNM_PATHNAME
+#undef	FNM_NOESCAPE
+#undef	FNM_PERIOD

 /* Bits set in the FLAGS argument to `fnmatch'.  */
-# define FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
-# define FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
-# define FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
-
-# if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
-#  define FNM_FILE_NAME	 FNM_PATHNAME	/* Preferred GNU name.  */
-#  define FNM_LEADING_DIR (1 << 3)	/* Ignore `/...' after a match.  */
-#  define FNM_CASEFOLD	 (1 << 4)	/* Compare without regard to case.  */
-#  define FNM_EXTMATCH	 (1 << 5)	/* Use ksh-like extended matching. */
-# endif
+#define	FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
+#define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
+#define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
+
+#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
+# define FNM_FILE_NAME	 FNM_PATHNAME	/* Preferred GNU name.  */
+# define FNM_LEADING_DIR (1 << 3)	/* Ignore `/...' after a match.  */
+# define FNM_CASEFOLD	 (1 << 4)	/* Compare without regard to case.  */
+# define FNM_EXTMATCH	 (1 << 5)	/* Use ksh-like extended matching. */
+#endif

 /* Value returned by `fnmatch' if STRING does not match PATTERN.  */
-# define FNM_NOMATCH	1
+#define	FNM_NOMATCH	1

 /* This value is returned if the implementation does not support
    `fnmatch'.  Since this is not the case here it will never be
    returned but the conformance test suites still require the symbol
    to be defined.  */
-# ifdef _XOPEN_SOURCE
-#  define FNM_NOSYS	(-1)
-# endif
+#ifdef _XOPEN_SOURCE
+# define FNM_NOSYS	(-1)
+#endif

 /* Match NAME against the file name pattern PATTERN,
    returning zero if it matches, FNM_NOMATCH if not.  */
 extern int fnmatch (const char *__pattern, const char *__name,
 		    int __flags);

-# ifdef	__cplusplus
+#ifdef	__cplusplus
 }
-# endif
+#endif

 #endif /* fnmatch.h */



[prev in list] [next in list] [prev in thread] [next in thread]