From 3b8ba971c0e2dab242e8bbf8ede60a2fdee05f71 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 27 Jan 1995 15:23:48 +0000 Subject: [PATCH] (basename): Use strrchr, not rindex. [!STDC_HEADERS && !HAVE_STRING_H]: Define strrchr to rindex. --- lib/basename.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/basename.c b/lib/basename.c index b8e7e1f4f1..56a6c04dd0 100644 --- a/lib/basename.c +++ b/lib/basename.c @@ -15,11 +15,17 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if defined(USG) || defined(STDC_HEADERS) +#ifdef HAVE_CONFIG_H +#include +#endif + +#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) #include -#define rindex strrchr #else #include +#ifndef strrchr +#define strrchr rindex +#endif #endif /* Return NAME with any leading path stripped off. */ @@ -30,6 +36,6 @@ basename (name) { char *base; - base = rindex (name, '/'); + base = strrchr (name, '/'); return base ? base + 1 : name; } -- 2.30.2