X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=basename.c;h=4d9fc4ec0c90107bef321a5037db557c2f1e7d9c;hb=d58ff8731ce635a75406cc8b9629f1041bb4ed32;hp=ac371d274490844fcbc6363137c3480c2104a8cd;hpb=b610615be9aedfac07d1e01f12575707fa3a227c;p=oweals%2Fbusybox.git

diff --git a/basename.c b/basename.c
index ac371d274..4d9fc4ec0 100644
--- a/basename.c
+++ b/basename.c
@@ -21,21 +21,13 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 
-const char *basename_usage="basename FILE [SUFFIX]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nStrips directory path and suffixes from FILE.\n"
-	"If specified, also removes any trailing SUFFIX.\n"
-#endif
-;
-
-
 extern int basename_main(int argc, char **argv)
 {
 	int m, n;
-	char *s, *s1;
+	char *s;
 
 	if ((argc < 2) || (**(argv + 1) == '-')) {
 		usage(basename_usage);
@@ -43,14 +35,7 @@ extern int basename_main(int argc, char **argv)
 
 	argv++;
 
-	s1=*argv+strlen(*argv)-1;
-	while (s1 && *s1 == '/') {
-		*s1 = '\0';
-		s1--;
-	}
-	s = strrchr(*argv, '/');
-	if (s==NULL) s=*argv;
-	else s++;
+	s = get_last_path_component(*argv);
 
 	if (argc>2) {
 		argv++;
@@ -62,4 +47,3 @@ extern int basename_main(int argc, char **argv)
 	printf("%s\n", s);
 	return(TRUE);
 }
-