A patch from Erik Meusel <erik@wh58-709.st.uni-magdeburg.de>

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

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index ceb750cb8a81093af6c3442b921281919a7f89a6..b534e6950a4345ae467c9279342b6f444b910440 100644 (file)
--- a/coreutils/dirname.c
+++ b/coreutils/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,25 +20,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "busybox.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_usage);
+               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 : ".");
+       puts (dirname (argv[0]));
+
        return EXIT_SUCCESS;
 }