X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fbasename.c;h=f59d7a8dee99b7c649cd0c0f6e49be69ee6c2f0b;hb=b6adbf1be29841501cc49917249e85f273e1df7c;hp=cba003d70078fb251cb92436a2b32191be28ff79;hpb=8ec10a9483f937743cba51124b30540c9613fca8;p=oweals%2Fbusybox.git

diff --git a/coreutils/basename.c b/coreutils/basename.c
index cba003d70..f59d7a8de 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -2,49 +2,49 @@
 /*
  * Mini basename implementation for busybox
  *
- * Copyright (C) 1999,2000,2001 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+/* 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 "busybox.h"
-#include <stdlib.h>
-#include <string.h>
+#include "libbb.h"
 
-extern int basename_main(int argc, char **argv)
+/* This is a NOFORK applet. Be very careful! */
+
+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 EXIT_SUCCESS;
+
+	puts(s);
+
+	return fflush(stdout);
 }