From 2251fd7866f9545630581d3c6b846e82481373c1 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Sat, 10 Mar 2001 10:43:52 +0000 Subject: [PATCH] cppfiles.c (search_from): Use lbasename. * cppfiles.c (search_from): Use lbasename. * mkdeps.c (deps_add_default_target): Use lbasename. From-SVN: r40364 --- gcc/ChangeLog | 5 +++++ gcc/cppfiles.c | 6 +----- gcc/mkdeps.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e8a825d247f..43a6ffeb0a0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2001-03-10 Neil Booth + + * cppfiles.c (search_from): Use lbasename. + * mkdeps.c (deps_add_default_target): Use lbasename. + 2001-03-09 Kaveh R. Ghazi * fixinc/server.c (load_data, run_shell): Use xmalloc, xrealloc & diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c index 7f15a8d24ca..b9c03d055f1 100644 --- 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 14935b328a6..8afd75e7416 100644 --- 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; -- 2.30.2