diff options
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/libiberty.h | 4 | ||||
| -rw-r--r-- | libiberty/ChangeLog | 6 | ||||
| -rw-r--r-- | libiberty/Makefile.in | 15 | ||||
| -rw-r--r-- | libiberty/lbasename.c | 89 |
5 files changed, 113 insertions, 6 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 21ce684..70009a4 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2001-03-10 Neil Booth <neil@daikokuya.demon.co.uk> + + John David Anglin <dave@hiauly1.hia.nrc.ca> + * include/libiberty.h: Add lbasename. + 2001-03-06 Zack Weinberg <zackw@stanford.edu> * libiberty.h: Prototype C_alloca; define alloca to either diff --git a/include/libiberty.h b/include/libiberty.h index e4fc2af..c61c1f0 100644 --- a/include/libiberty.h +++ b/include/libiberty.h @@ -56,6 +56,10 @@ extern char *basename (); # endif #endif +/* A well-defined basename () that is always compiled in. */ + +extern char *lbasename PARAMS ((const char *)); + /* Concatenate an arbitrary number of strings, up to (char *) NULL. Allocates memory using xmalloc. */ diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 27cb034..c241e22 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2001-03-10 Neil Booth <neil@daikokuya.demon.co.uk> + + John David Anglin <dave@hiauly1.hia.nrc.ca> + * libiberty/lbasename.c: New file. + * libiberty/Makefile.in: Update for lbasename. + 2001-03-06 Zack Weinberg <zackw@stanford.edu> * aclocal.m4 (libiberty_AC_FUNC_C_ALLOCA): New. diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index 5ea3bd5..d020218 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -124,7 +124,8 @@ CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c \ bzero.c calloc.c choose-temp.c clock.c concat.c cplus-dem.c \ cp-demangle.c dyn-string.c fdmatch.c fnmatch.c getcwd.c \ getpwd.c getopt.c getopt1.c getpagesize.c getruntime.c \ - floatformat.c hashtab.c hex.c index.c insque.c md5.c memchr.c \ + floatformat.c hashtab.c hex.c index.c insque.c lbasename.c \ + md5.c memchr.c \ memcmp.c memcpy.c memmove.c memset.c mkstemps.c objalloc.c obstack.c \ partition.c pexecute.c putenv.c random.c rename.c rindex.c setenv.c \ sigsetmask.c safe-ctype.c sort.c spaces.c splay-tree.c strcasecmp.c \ @@ -134,11 +135,12 @@ CFILES = asprintf.c alloca.c argv.c atexit.c basename.c bcmp.c bcopy.c \ xmalloc.c xmemdup.c xstrdup.c xstrerror.c # These are always included in the library. -REQUIRED_OFILES = argv.o alloca.o choose-temp.o concat.o cplus-dem.o \ - cp-demangle.o dyn-string.o fdmatch.o fnmatch.o getopt.o getopt1.o \ - getpwd.o getruntime.o hashtab.o hex.o floatformat.o md5.o objalloc.o \ - obstack.o partition.o pexecute.o safe-ctype.o sort.o spaces.o \ - splay-tree.o strerror.o strsignal.o xatexit.o xexit.o xmalloc.o \ +REQUIRED_OFILES = argv.o alloca.o choose-temp.o concat.o cplus-dem.o \ + cp-demangle.o dyn-string.o fdmatch.o fnmatch.o getopt.o getopt1.o \ + getpwd.o getruntime.o hashtab.o hex.o floatformat.o lbasename.o \ + md5.o objalloc.o \ + obstack.o partition.o pexecute.o safe-ctype.o sort.o spaces.o \ + splay-tree.o strerror.o strsignal.o xatexit.o xexit.o xmalloc.o \ xmemdup.o xstrdup.o xstrerror.o $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) @@ -271,6 +273,7 @@ getpwd.o: config.h $(INCDIR)/libiberty.h getruntime.o: config.h $(INCDIR)/libiberty.h hex.o: $(INCDIR)/libiberty.h floatformat.o: $(INCDIR)/floatformat.h +lbasename.o: $(INCDIR)/libiberty.h mkstemps.o: config.h md5.o: config.h objalloc.o: config.h $(INCDIR)/objalloc.h diff --git a/libiberty/lbasename.c b/libiberty/lbasename.c new file mode 100644 index 0000000..7f87049 --- /dev/null +++ b/libiberty/lbasename.c @@ -0,0 +1,89 @@ +/* Libiberty basename. Like basename, but is not overridden by the + system C library. + Copyright (C) 2001 Free Software Foundation, Inc. + +This file is part of the libiberty library. +Libiberty 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. + +Libiberty 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. + +You should have received a copy of the GNU Library General Public +License along with libiberty; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +/* +NAME + lbasename -- return pointer to last component of a pathname + +SYNOPSIS + char *lbasename (const char *name) + +DESCRIPTION + Given a pointer to a string containing a typical pathname + (/usr/src/cmd/ls/ls.c for example), returns a pointer to the + last component of the pathname ("ls.c" in this case). The + returned pointer is guaranteed to lie within the original + string. This latter fact is not true of many vendor C + libraries, which return special strings or modify the passed + strings for particular input. + + In particular, the empty string returns the same empty string, + and a path ending in '/' returns the empty string after it. +*/ + +#include "ansidecl.h" +#include "libiberty.h" +#include "safe-ctype.h" + +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) \ + || defined (__DJGPP__) || defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +#endif + +/* Define IS_DIR_SEPARATOR. VMS uses '::', ':', '[...]' and '<...>' to + separate the different components of a file specification. It's a + bit of a stretch to call ':', ']' and '>' directory separators, so + just define the test to find the file name component. */ +#ifdef VMS +# define IS_DIR_SEPARATOR(ch) ((ch) == ':' || (ch) == ']' || (ch) == '>') +#else +# ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +# else +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +# endif +#endif + +char * +lbasename (name) + const char *name; +{ + const char *base; + +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + /* Skip over a possible disk name. */ + if (ISALPHA (name[0]) && name[1] == ':') + name += 2; +#endif + + for (base = name; *name; name++) + if (IS_DIR_SEPARATOR (*name)) + base = name + 1; + + return (char *) base; +} |