projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Indent nested CPP-directives.
[gnulib.git]
/
lib
/
basename.c
diff --git
a/lib/basename.c
b/lib/basename.c
index
a47b200
..
7e0c1f6
100644
(file)
--- a/
lib/basename.c
+++ b/
lib/basename.c
@@
-19,23
+19,20
@@
#include <config.h>
#endif
#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 *
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;
}
}