Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / basename.c

diff --git a/basename.c b/basename.c
index 06e27663f813e34de059a3a3cb09750cd9e66e31..5678c4433daf04a023da1359701803df4786240e 100644 (file)
--- a/basename.c
+++ b/basename.c
@@ -24,20 +24,34 @@
 #include "internal.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)
 {
-       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;
-       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);
+}