* fnmatch.h, fnmatch.c: Remove (now in libiberty).
* Makefile.in: Rebuild dependencies. (CFILES): Remove fnmatch.c. (HFILES): Remove fnmatch.h. (OFILES): Remove fnmatch.o.
This commit is contained in:
Ian Lance Taylor
parent
fa8e5931d8
commit
3fac4887a0
5 changed files with 12 additions and 293 deletions
|
|
@ -39,8 +39,6 @@ configure.tgt
|
||||||
dep-in.sed
|
dep-in.sed
|
||||||
emulparams
|
emulparams
|
||||||
emultempl
|
emultempl
|
||||||
fnmatch.c
|
|
||||||
fnmatch.h
|
|
||||||
genscripts.sh
|
genscripts.sh
|
||||||
h8-doc.texi
|
h8-doc.texi
|
||||||
ld.1
|
ld.1
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,11 @@
|
||||||
|
Thu Oct 3 13:52:03 1996 Ian Lance Taylor <ian@cygnus.com>
|
||||||
|
|
||||||
|
* fnmatch.h, fnmatch.c: Remove (now in libiberty).
|
||||||
|
* Makefile.in: Rebuild dependencies.
|
||||||
|
(CFILES): Remove fnmatch.c.
|
||||||
|
(HFILES): Remove fnmatch.h.
|
||||||
|
(OFILES): Remove fnmatch.o.
|
||||||
|
|
||||||
Thu Oct 3 15:41:24 1996 Jason Molenda (crash@godzilla.cygnus.co.jp)
|
Thu Oct 3 15:41:24 1996 Jason Molenda (crash@godzilla.cygnus.co.jp)
|
||||||
|
|
||||||
* Makefile.in (mostlyclean): Move config.log to distclean.
|
* Makefile.in (mostlyclean): Move config.log to distclean.
|
||||||
|
|
|
||||||
|
|
@ -288,18 +288,18 @@ ALL_EMULATIONS = \
|
||||||
|
|
||||||
CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
|
CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \
|
||||||
ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \
|
ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \
|
||||||
mri.c ldcref.c fnmatch.c
|
mri.c ldcref.c
|
||||||
|
|
||||||
HFILES = config.h ld.h ldctor.h ldemul.h ldexp.h ldfile.h \
|
HFILES = config.h ld.h ldctor.h ldemul.h ldexp.h ldfile.h \
|
||||||
ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \
|
ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \
|
||||||
ldwrite.h mri.h fnmatch.h
|
ldwrite.h mri.h
|
||||||
|
|
||||||
GENERATED_CFILES = ldgram.c ldlex.c
|
GENERATED_CFILES = ldgram.c ldlex.c
|
||||||
GENERATED_HFILES = ldgram.h ldemul-list.h
|
GENERATED_HFILES = ldgram.h ldemul-list.h
|
||||||
|
|
||||||
OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \
|
OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \
|
||||||
ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o \
|
ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o \
|
||||||
ldfile.o ldcref.o fnmatch.o ${EMULATION_OFILES}
|
ldfile.o ldcref.o ${EMULATION_OFILES}
|
||||||
|
|
||||||
LINTSOURCES = $(CFILES) $(GENERATED_CFILES) e*.c
|
LINTSOURCES = $(CFILES) $(GENERATED_CFILES) e*.c
|
||||||
|
|
||||||
|
|
@ -1034,7 +1034,7 @@ ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
||||||
$(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
$(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h ld.h ldmain.h \
|
||||||
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
|
ldgram.h ldexp.h ldlang.h ldemul.h ldlex.h ldmisc.h \
|
||||||
ldctor.h ldfile.h fnmatch.h
|
ldctor.h ldfile.h $(INCDIR)/fnmatch.h
|
||||||
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
||||||
$(INCDIR)/libiberty.h $(INCDIR)/progress.h $(INCDIR)/bfdlink.h \
|
$(INCDIR)/libiberty.h $(INCDIR)/progress.h $(INCDIR)/bfdlink.h \
|
||||||
|
|
@ -1063,7 +1063,6 @@ ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
||||||
$(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h ldmain.h \
|
$(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h ldmain.h \
|
||||||
ldmisc.h ldexp.h ldlang.h
|
ldmisc.h ldexp.h ldlang.h
|
||||||
fnmatch.o: fnmatch.c
|
|
||||||
ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
|
||||||
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
$(INCDIR)/obstack.h sysdep.h config.h $(INCDIR)/fopen-same.h \
|
||||||
$(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldemul.h \
|
$(INCDIR)/bfdlink.h ld.h ldexp.h ldver.h ldlang.h ldemul.h \
|
||||||
|
|
|
||||||
217
ld/fnmatch.c
217
ld/fnmatch.c
|
|
@ -1,217 +0,0 @@
|
||||||
/* Copyright (C) 1991, 1992, 1993 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, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
||||||
|
|
||||||
/* Modified for GNU ld to include sysdep.h. */
|
|
||||||
#include "sysdep.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#if defined (CONFIG_BROKETS)
|
|
||||||
/* We use <config.h> instead of "config.h" so that a compilation
|
|
||||||
using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
|
|
||||||
(which it would do because it found this file in $srcdir). */
|
|
||||||
#include <config.h>
|
|
||||||
#else
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _GNU_SOURCE
|
|
||||||
#define _GNU_SOURCE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fnmatch.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
|
|
||||||
|
|
||||||
/* Comment out all this code if we are using the GNU C Library, and are not
|
|
||||||
actually compiling the library itself. This code is part of the GNU C
|
|
||||||
Library, but also included in many other GNU distributions. Compiling
|
|
||||||
and linking in this code is a waste when using the GNU C library
|
|
||||||
(especially if it is a shared library). Rather than having every GNU
|
|
||||||
program understand `configure --with-gnu-libc' and omit the object files,
|
|
||||||
it is simpler to just do this in the source for each such file. */
|
|
||||||
|
|
||||||
#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
|
|
||||||
|
|
||||||
|
|
||||||
#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
|
|
||||||
extern int errno;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Match STRING against the filename pattern PATTERN, returning zero if
|
|
||||||
it matches, nonzero if not. */
|
|
||||||
int
|
|
||||||
fnmatch (pattern, string, flags)
|
|
||||||
const char *pattern;
|
|
||||||
const char *string;
|
|
||||||
int flags;
|
|
||||||
{
|
|
||||||
register const char *p = pattern, *n = string;
|
|
||||||
register char c;
|
|
||||||
|
|
||||||
/* Note that this evalutes C many times. */
|
|
||||||
#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c))
|
|
||||||
|
|
||||||
while ((c = *p++) != '\0')
|
|
||||||
{
|
|
||||||
c = FOLD (c);
|
|
||||||
|
|
||||||
switch (c)
|
|
||||||
{
|
|
||||||
case '?':
|
|
||||||
if (*n == '\0')
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
else if ((flags & FNM_FILE_NAME) && *n == '/')
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
else if ((flags & FNM_PERIOD) && *n == '.' &&
|
|
||||||
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '\\':
|
|
||||||
if (!(flags & FNM_NOESCAPE))
|
|
||||||
{
|
|
||||||
c = *p++;
|
|
||||||
c = FOLD (c);
|
|
||||||
}
|
|
||||||
if (FOLD (*n) != c)
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case '*':
|
|
||||||
if ((flags & FNM_PERIOD) && *n == '.' &&
|
|
||||||
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
for (c = *p++; c == '?' || c == '*'; c = *p++, ++n)
|
|
||||||
if (((flags & FNM_FILE_NAME) && *n == '/') ||
|
|
||||||
(c == '?' && *n == '\0'))
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
if (c == '\0')
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
{
|
|
||||||
char c1 = (!(flags & FNM_NOESCAPE) && c == '\\') ? *p : c;
|
|
||||||
c1 = FOLD (c1);
|
|
||||||
for (--p; *n != '\0'; ++n)
|
|
||||||
if ((c == '[' || FOLD (*n) == c1) &&
|
|
||||||
fnmatch (p, n, flags & ~FNM_PERIOD) == 0)
|
|
||||||
return 0;
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
case '[':
|
|
||||||
{
|
|
||||||
/* Nonzero if the sense of the character class is inverted. */
|
|
||||||
register int not;
|
|
||||||
|
|
||||||
if (*n == '\0')
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
if ((flags & FNM_PERIOD) && *n == '.' &&
|
|
||||||
(n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/')))
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
not = (*p == '!' || *p == '^');
|
|
||||||
if (not)
|
|
||||||
++p;
|
|
||||||
|
|
||||||
c = *p++;
|
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
register char cstart = c, cend = c;
|
|
||||||
|
|
||||||
if (!(flags & FNM_NOESCAPE) && c == '\\')
|
|
||||||
cstart = cend = *p++;
|
|
||||||
|
|
||||||
cstart = cend = FOLD (cstart);
|
|
||||||
|
|
||||||
if (c == '\0')
|
|
||||||
/* [ (unterminated) loses. */
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
c = *p++;
|
|
||||||
c = FOLD (c);
|
|
||||||
|
|
||||||
if ((flags & FNM_FILE_NAME) && c == '/')
|
|
||||||
/* [/] can never match. */
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
if (c == '-' && *p != ']')
|
|
||||||
{
|
|
||||||
cend = *p++;
|
|
||||||
if (!(flags & FNM_NOESCAPE) && cend == '\\')
|
|
||||||
cend = *p++;
|
|
||||||
if (cend == '\0')
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
cend = FOLD (cend);
|
|
||||||
|
|
||||||
c = *p++;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (FOLD (*n) >= cstart && FOLD (*n) <= cend)
|
|
||||||
goto matched;
|
|
||||||
|
|
||||||
if (c == ']')
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (!not)
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
break;
|
|
||||||
|
|
||||||
matched:;
|
|
||||||
/* Skip the rest of the [...] that already matched. */
|
|
||||||
while (c != ']')
|
|
||||||
{
|
|
||||||
if (c == '\0')
|
|
||||||
/* [... (unterminated) loses. */
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
|
|
||||||
c = *p++;
|
|
||||||
if (!(flags & FNM_NOESCAPE) && c == '\\')
|
|
||||||
/* XXX 1003.2d11 is unclear if this is right. */
|
|
||||||
++p;
|
|
||||||
}
|
|
||||||
if (not)
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
if (c != FOLD (*n))
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
++n;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (*n == '\0')
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if ((flags & FNM_LEADING_DIR) && *n == '/')
|
|
||||||
/* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz". */
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
return FNM_NOMATCH;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _LIBC or not __GNU_LIBRARY__. */
|
|
||||||
69
ld/fnmatch.h
69
ld/fnmatch.h
|
|
@ -1,69 +0,0 @@
|
||||||
/* Copyright (C) 1991, 1992, 1993 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, 675 Mass Ave, Cambridge, MA 02139, 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 */
|
|
||||||
Loading…
Reference in a new issue