(basename): Rewrite so it doesn't rely on strrchr,

and hence doesn't need to include string.h -- on some alpha-based
OSF systems, there's a conflicting prototype for basename in string.h.
Reported by Kaveh Ghazi.

1 files changed, 11 insertions, 14 deletions

diff --git a/lib/basename.c b/lib/basename.c
index a47b200e5..7e0c1f611 100644
--- a/lib/basename.c
+++ b/lib/basename.c
@@ -19,23 +19,20 @@
 #include <config.h>
 #endif
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-#include <string.h>
-#else
-#include <strings.h>
-#ifndef strrchr
-#define strrchr rindex
-#endif
-#endif
-
-/* Return NAME with any leading path stripped off.  */
+/* Return NAME with any leading path stripped off.
+   Don't use strrchr/rindex.  */
 
 char *
 basename (name)
      const char *name;
 {
-  char *base;
-
-  base = strrchr (name, '/');
-  return base ? base + 1 : (char *) name;
+  const char *base = name;
+
+  while (*name)
+    {
+      if (*name == '/')
+	base = name + 1;
+      ++name;
+    }
+  return (char *) base;
 }