X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=dirname.c;h=8313e99c692c26af3ec34578da561b08acdcde2e;hb=4391a16c92cef744fc715cb7347b7b71fc8f312e;hp=ce3cd6f03d24e7cd4aeb871ec7fddcf03d5b03cf;hpb=59b9e870243c56a9c5ec045a925e4e9b3f1f6c3c;p=oweals%2Fbusybox.git

diff --git a/dirname.c b/dirname.c
index ce3cd6f03..8313e99c6 100644
--- a/dirname.c
+++ b/dirname.c
@@ -2,7 +2,7 @@
 /*
  * Mini dirname implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,30 +20,31 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "internal.h"
+
+/* getopt not needed */
+
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "busybox.h"
 
 extern int dirname_main(int argc, char **argv)
 {
 	char* s;
 
-	if ((argc < 2) || (**(argv + 1) == '-')) {
-		usage("dirname [FILENAME ...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-				"\nStrips non-directory suffix from FILENAME\n"
-#endif
-				);
-	}
+	if ((argc < 2) || (**(argv + 1) == '-'))
+		show_usage();
 	argv++;
 
 	s=*argv+strlen(*argv)-1;
-	while (s && *s == '/') {
-		*s = '\0';
-		s=*argv+strlen(*argv)-1;
+	while (s != *argv && *s == '/') {
+		*s-- = '\0';
 	}
 	s = strrchr(*argv, '/');
-	if (s && *s)
+	if (s != NULL && s == *argv)
+		s[1] = '\0';
+	else if (s != NULL)
 		*s = '\0';
-	printf("%s\n", (s)? *argv : ".");
-	exit(TRUE);
+	puts(s ? *argv : ".");
+	return EXIT_SUCCESS;
 }