X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=dirname.c;h=b534e6950a4345ae467c9279342b6f444b910440;hb=1b06419e6013ce8319be2a868bc22a6e0f4d7671;hp=528b89a56dc6fe7a73585c049dda90b9ddf428d4;hpb=9cf3bfa7c1bf3ad959c61711c9a5ac1969149300;p=oweals%2Fbusybox.git

diff --git a/dirname.c b/dirname.c
index 528b89a56..b534e6950 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,26 +20,21 @@
  * 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 [file ...]\n");
-	}
+	if ((argc < 2) || (**(argv + 1) == '-'))
+		show_usage();
 	argv++;
 
-	s=*argv+strlen(*argv)-1;
-	while (s && *s == '/') {
-		*s = '\0';
-		s=*argv+strlen(*argv)-1;
-	}
-	s = strrchr(*argv, '/');
-	if (s && *s)
-		*s = '\0';
-	printf("%s\n", (s)? *argv : ".");
-	exit(TRUE);
+	puts (dirname (argv[0]));
+
+	return EXIT_SUCCESS;
 }