X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=basename.c;h=fcc7d4619ec458fbbddaf88e63605aa385f3d78b;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=5fe5e0f0391da740cba9c6a0dd0ce8c978944819;hpb=9cf3bfa7c1bf3ad959c61711c9a5ac1969149300;p=oweals%2Fbusybox.git

diff --git a/basename.c b/basename.c
index 5fe5e0f03..fcc7d4619 100644
--- a/basename.c
+++ b/basename.c
@@ -21,25 +21,29 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 
 extern int basename_main(int argc, char **argv)
 {
-	char* s, *s1;
+	int m, n;
+	char *s;
 
 	if ((argc < 2) || (**(argv + 1) == '-')) {
-		usage("basename [file ...]\n");
+		usage(basename_usage);
 	}
+
 	argv++;
 
-	s1=*argv+strlen(*argv)-1;
-	while (s1 && *s1 == '/') {
-		*s1 = '\0';
-		s1=*argv+strlen(*argv)-1;
+	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';
 	}
-	s = strrchr(*argv, '/');
-	printf("%s\n", (s)? s + 1 : *argv);
-	exit(TRUE);
+	printf("%s\n", s);
+	return EXIT_SUCCESS;
 }
-