Undo all of the ugliness and some of the bloat from 15412.

[oweals/busybox.git] / coreutils / basename.c

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 4d9fc4ec0c90107bef321a5037db557c2f1e7d9c..91652cfedf948e29678dcdfb9d10503412a55ba6 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -2,8 +2,7 @@
 /*
  * Mini basename implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,29 +20,43 @@
  *
  */
 
-#include "busybox.h"
+/* 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 <stdio.h>
+#include <string.h>
+#include "busybox.h"
 
-extern int basename_main(int argc, char **argv)
+int basename_main(int argc, char **argv)
 {
-       int m, n;
+       size_t m, n;
        char *s;
 
-       if ((argc < 2) || (**(argv + 1) == '-')) {
-               usage(basename_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';
+               }
        }
-       printf("%s\n", s);
-       return(TRUE);
+
+       puts(s);
+
+       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 }