summaryrefslogtreecommitdiff
path: root/coreutils/basename.c
diff options
context:
space:
mode:
authorManuel Novoa III2003-03-19 09:13:01 +0000
committerManuel Novoa III2003-03-19 09:13:01 +0000
commitcad5364599eb5062d59e0c397ed638ddd61a8d5d (patch)
treea318d0f03aa076c74b576ea45dc543a5669e8e91 /coreutils/basename.c
parente01f9662a5bd5d91be4f6b3941b57fff73cd5af1 (diff)
downloadbusybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.zip
busybox-cad5364599eb5062d59e0c397ed638ddd61a8d5d.tar.gz
Major coreutils update.
Diffstat (limited to 'coreutils/basename.c')
-rw-r--r--coreutils/basename.c35
1 files changed, 23 insertions, 12 deletions
diff --git a/coreutils/basename.c b/coreutils/basename.c
index bdbcec1..71bb9b3 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 <stdlib.h>
-#include "busybox.h"
+#include <stdio.h>
#include <string.h>
+#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);
}