cppfiles.c (search_from): Use lbasename.

	* cppfiles.c (search_from): Use lbasename.
	* mkdeps.c (deps_add_default_target): Use lbasename.

From-SVN: r40364

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8a825d247f72d58d766276f5be886b974e681b6..43a6ffeb0a0222983c1977514487c6b0f5dc2cad 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-10  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * cppfiles.c (search_from): Use lbasename.
+       * mkdeps.c (deps_add_default_target): Use lbasename.
+
 2001-03-09  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * fixinc/server.c (load_data, run_shell): Use xmalloc, xrealloc &

diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 7f15a8d24cace27e3b49aa2e879b2ed35d905b47..b9c03d055f1f21e343dd3e8e044f938d63fd0dd7 100644 (file)
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -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

diff --git a/gcc/mkdeps.c b/gcc/mkdeps.c
index 14935b328a6e1ff77289ebd8c328861edd00c78e..8afd75e7416d409e1eedaf62148ab63ef72d157a 100644 (file)
--- a/gcc/mkdeps.c
+++ b/gcc/mkdeps.c
@@ -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;