[RFA] libiberty: lbasename ()
Neil Booth
neil@daikokuya.demon.co.uk
Thu Mar 8 14:53:00 GMT 2001
In the interests of solving the never-ending basename () issue, here's
a patch to add a "libiberty basename" function with the well-defined
semantics that GCC appears to want, and that is not ignored in favour
of an ill-defined host C library function.
OK for the libiberty parts in mainline? Bootstrapped x86 Linux.
Neil.
* libiberty/lbasename.c: New file.
* libiberty/Makefile.in: Update for lbasename.
* libiberty/configure.in: Similarly.
* include/libiberty.h: Add lbasename.
* cppfiles.c (search_from): Use lbasename.
* mkdeps.c (deps_add_default_target): Use lbasename.
Index: libiberty/lbasename.c
===================================================================
RCS file: lbasename.c
diff -N lbasename.c
--- /dev/null Tue May 5 13:32:27 1998
+++ lbasename.c Thu Mar 8 14:46:32 2001
@@ -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;
+}
Index: libiberty/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/Makefile.in,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile.in
--- Makefile.in 2001/03/06 09:52:35 1.58
+++ Makefile.in 2001/03/08 22:46:35
@@ -124,7 +124,8 @@ CFILES = asprintf.c alloca.c argv.c atex
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 atex
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
Index: libiberty/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libiberty/configure.in,v
retrieving revision 1.32
diff -u -p -r1.32 configure.in
--- configure.in 2001/03/06 09:52:35 1.32
+++ configure.in 2001/03/08 22:46:35
@@ -91,6 +91,7 @@ funcs="$funcs getcwd"
funcs="$funcs getpagesize"
funcs="$funcs index"
funcs="$funcs insque"
+funcs="$funcs lbasename"
funcs="$funcs memchr"
funcs="$funcs memcmp"
funcs="$funcs memcpy"
@@ -129,7 +130,8 @@ checkfuncs="getrusage on_exit psignal st
# autoheader happy without adding a bunch of text to acconfig.h.
if test "x" = "y"; then
AC_CHECK_FUNCS(asprintf atexit basename bcmp bcopy bsearch bzero calloc clock)
- AC_CHECK_FUNCS(getcwd getpagesize index insque mkstemps memchr memcmp memcpy)
+ AC_CHECK_FUNCS(getcwd getpagesize index insque lbasename mkstemps memchr)
+ AC_CHECK_FUNCS(memcmp memcpy)
AC_CHECK_FUNCS(memmove memset putenv random rename rindex sigsetmask)
AC_CHECK_FUNCS(strcasecmp setenv strchr strdup strncasecmp strrchr strstr)
AC_CHECK_FUNCS(strtod strtol strtoul tmpnam vasprintf vfprintf vprintf)
Index: gcc/cppfiles.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cppfiles.c,v
retrieving revision 1.107
diff -u -p -r1.107 cppfiles.c
--- cppfiles.c 2001/03/04 15:10:46 1.107
+++ cppfiles.c 2001/03/08 22:47:10
@@ -804,11 +804,7 @@ search_from (pfile, inc)
if (CPP_OPTION (pfile, ignore_srcdir))
return CPP_OPTION (pfile, quote_include);
- /* basename () on Solaris returns "." for an empty string. */
- dlen = 0;
- if (inc->name[0] != '\0')
- dlen = basename (inc->name) - inc->name;
-
+ dlen = lbasename (inc->name) - inc->name;
if (dlen)
{
/* We don't guarantee NAME is null-terminated. This saves
Index: gcc/mkdeps.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/mkdeps.c,v
retrieving revision 1.12
diff -u -p -r1.12 mkdeps.c
--- mkdeps.c 2001/02/12 14:06:21 1.12
+++ mkdeps.c 2001/03/08 22:47:10
@@ -191,7 +191,7 @@ deps_add_default_target (d, tgt)
#ifndef OBJECT_SUFFIX
# define OBJECT_SUFFIX ".o"
#endif
- char *start = basename (tgt);
+ char *start = lbasename (tgt);
char *o = (char *) alloca (strlen (start) + strlen (OBJECT_SUFFIX) + 1);
char *suffix;
Index: include/libiberty.h
===================================================================
RCS file: /cvs/gcc/gcc/include/libiberty.h,v
retrieving revision 1.15
diff -u -p -r1.15 libiberty.h
--- libiberty.h 2001/03/06 09:52:35 1.15
+++ libiberty.h 2001/03/08 22:47:10
@@ -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. */
More information about the Gcc-patches
mailing list