Extend overflow detection in re_dfa_add_node.

[platform/upstream/glibc.git] / posix / fnmatch.h

diff --git a/posix/fnmatch.h b/posix/fnmatch.h
index eeaee7f..aefb007 100644 (file)
--- a/posix/fnmatch.h
+++ b/posix/fnmatch.h
@@ -1,20 +1,20 @@
-/* Copyright (C) 1991, 92, 93, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991-93,96,97,98,99,2001,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library 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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef        _FNMATCH_H
 #define        _FNMATCH_H      1
@@ -23,19 +23,6 @@
 extern "C" {
 #endif
 
-#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-# if !defined __GLIBC__ || !defined __P
-#  undef       __P
-#  define __P(protos)  protos
-# endif
-#else /* Not C++ or ANSI C.  */
-# undef        __P
-# define __P(protos)   ()
-/* We can get away without defining `const' here only because in this file
-   it is used only inside the prototype for `fnmatch', which is elided in
-   non-ANSI C where `const' is problematical.  */
-#endif /* C++ or ANSI C.  */
-
 #ifndef const
 # if (defined __STDC__ && __STDC__) || defined __cplusplus
 #  define __const      const
@@ -59,6 +46,7 @@ extern "C" {
 # 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.  */
@@ -72,10 +60,10 @@ extern "C" {
 # define FNM_NOSYS     (-1)
 #endif
 
-/* Match STRING against the filename pattern PATTERN,
+/* Match NAME against the filename pattern PATTERN,
    returning zero if it matches, FNM_NOMATCH if not.  */
-extern int fnmatch __P ((__const char *__pattern, __const char *__string,
-                        int __flags));
+extern int fnmatch (__const char *__pattern, __const char *__name,
+                   int __flags);
 
 #ifdef __cplusplus
 }