From cad5364599eb5062d59e0c397ed638ddd61a8d5d Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Wed, 19 Mar 2003 09:13:01 +0000 Subject: Major coreutils update. --- coreutils/basename.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'coreutils/basename.c') diff --git a/coreutils/basename.c b/coreutils/basename.c index bdbcec17a..71bb9b3bd 100644 --- a/coreutils/basename.c +++ b/coreutils/basename.c @@ -21,32 +21,43 @@ * */ -/* getopt not needed */ +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */ + + +/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org) + * + * Changes: + * 1) Now checks for too many args. Need at least one and at most two. + * 2) Don't check for options, as per SUSv3. + * 3) Save some space by using strcmp(). Calling strncmp() here was silly. + */ #include -#include "busybox.h" +#include #include +#include "busybox.h" extern int basename_main(int argc, char **argv) { - int m, n; + size_t m, n; char *s; - if ((argc < 2) || (**(argv + 1) == '-')) { - show_usage(); + if (((unsigned int)(argc-2)) >= 2) { + bb_show_usage(); } - argv++; - - s = get_last_path_component(*argv); + s = bb_get_last_path_component(*++argv); - if (argc>2) { - argv++; + if (*++argv) { n = strlen(*argv); m = strlen(s); - if (m>n && strncmp(s+m-n, *argv, n)==0) + if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) { s[m-n] = '\0'; + } } + puts(s); - return EXIT_SUCCESS; + + bb_fflush_stdout_and_exit(EXIT_SUCCESS); } -- cgit v1.2.3