Changeset 3779 for branches/libc-0.6/src

Timestamp:

Mar 22, 2012, 2:35:38 PM (13 years ago)

Author:

bird

Message:

Drop the liberty fnmatch.h, adding the GNUisms to the emx header. Fixes #193.

Location:

branches/libc-0.6/src/emx/include

Files:

• emx/fnmatch.h (modified) (2 diffs)
• fnmatch.h (modified) (1 diff)

branches/libc-0.6/src/emx/include/emx/fnmatch.h

@@ -40 +40 @@
 
 
+#if !defined (_POSIX_SOURCE) || defined (_GnU_SOURCE) || defined(__USE_EMX)
+/* GNU liberty compatibility */
+# define FNM_FILE_NAME     FNM_PATHNAME
+# define FNM_CASEFOLD      128 /* _FNM_IGNORECASE */
+/*# define FNM_LEADING_DIR   256 -  _FNM_PATHPREFIX?? */
+#endif
+
 #if defined (__cplusplus)
 }
@@ -45 +52 @@
 
 #endif /* not _FNMATCH_H */
+

branches/libc-0.6/src/emx/include/fnmatch.h

@@ -1 @@
-/* fnmatch.h,v 1.3 2004/09/14 22:27:33 bird Exp */
-/** @file
- * GNU, -liberty.
- * @todo    Update the fnmatch code in LIBC to match this file.
- */
+#include <emx/fnmatch.h>
 
-/* Copyright 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
-
-NOTE: The canonical source of this file is maintained with the GNU C Library.
-Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-
-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) 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, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#ifndef _FNMATCH_H
-
-#define _FNMATCH_H      1
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
-#undef  __P
-#define __P(args)       args
-#else /* Not C++ or ANSI C.  */
-#undef  __P
-#define __P(args)       ()
-/* 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.  */
-
-
-/* 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
-
-/* 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.  */
-#endif
-
-/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
-#define FNM_NOMATCH     1
-
-/* Match STRING 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));
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* fnmatch.h */