projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-organized some sections and added a whole new section on avoiding the
[oweals/busybox.git]
/
basename.c
diff --git
a/basename.c
b/basename.c
index 06e27663f813e34de059a3a3cb09750cd9e66e31..4d9fc4ec0c90107bef321a5037db557c2f1e7d9c 100644
(file)
--- a/
basename.c
+++ b/
basename.c
@@
-21,23
+21,29
@@
*
*/
*
*/
-#include "
internal
.h"
+#include "
busybox
.h"
#include <stdio.h>
extern int basename_main(int argc, char **argv)
{
#include <stdio.h>
extern int basename_main(int argc, char **argv)
{
- char* s, *s1;
+ int m, n;
+ char *s;
if ((argc < 2) || (**(argv + 1) == '-')) {
if ((argc < 2) || (**(argv + 1) == '-')) {
- usage(
"basename [file ...]\n"
);
+ usage(
basename_usage
);
}
}
+
argv++;
argv++;
- s1=*argv+strlen(*argv)-1;
- if (*s1 == '/')
- *s1 = '\0';
- s = strrchr(*argv, '/');
- printf("%s\n", (s)? s + 1 : *argv);
- exit(TRUE);
-}
+ s = get_last_path_component(*argv);
+ if (argc>2) {
+ argv++;
+ n = strlen(*argv);
+ m = strlen(s);
+ if (m>=n && strncmp(s+m-n, *argv, n)==0)
+ s[m-n] = '\0';
+ }
+ printf("%s\n", s);
+ return(TRUE);
+}