X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fbasename.c;h=7b8b7b6f064f5410bc9c2525bdc8e45f553dd676;hb=f9584a19ca738762c9bb2ce899fe9c3d9e746da0;hp=06e27663f813e34de059a3a3cb09750cd9e66e31;hpb=61677feff7f549a48267c2c0c50a7420de6e2599;p=oweals%2Fbusybox.git

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 06e27663f..7b8b7b6f0 100644
--- 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,23 +20,43 @@
  *
  */
 
-#include "internal.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)
 {
-	char* s, *s1;
+	size_t m, n;
+	char *s;
 
-	if ((argc < 2) || (**(argv + 1) == '-')) {
-		usage("basename [file ...]\n");
+	if (((unsigned int)(argc-2)) >= 2) {
+		bb_show_usage();
 	}
-	argv++;
-
-	s1=*argv+strlen(*argv)-1;
-	if (*s1 == '/')
-		*s1 = '\0';
-	s = strrchr(*argv, '/');
-	printf("%s\n", (s)? s + 1 : *argv);
-	exit(TRUE);
-}
 
+	s = bb_get_last_path_component(*++argv);
+
+	if (*++argv) {
+		n = strlen(*argv);
+		m = strlen(s);
+		if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) {
+			s[m-n] = '\0';
+		}
+	}
+
+	puts(s);
+
+	bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+}