diff options
author | Jim Meyering <jim@meyering.net> | 1995-01-27 15:23:48 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1995-01-27 15:23:48 +0000 |
commit | 85bb215ab8496b9a293f6c37997087a6bad9d8c5 (patch) | |
tree | 81ef3e2253dbd01814413071b43c5c6ccab3c9d9 | |
parent | b38a5a7a17beb1d8ea21acbf64e202fd0ae8b5d4 (diff) | |
download | coreutils-85bb215ab8496b9a293f6c37997087a6bad9d8c5.tar.xz |
(basename): Use strrchr, not rindex.
[!STDC_HEADERS && !HAVE_STRING_H]: Define strrchr to rindex.
-rw-r--r-- | lib/basename.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/basename.c b/lib/basename.c index b8e7e1f4f..56a6c04dd 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 <config.h> +#endif + +#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) #include <string.h> -#define rindex strrchr #else #include <strings.h> +#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; } |