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 e34ecf8a90d65fe6b5659ded42a3f6ddb112c834..b534e6950a4345ae467c9279342b6f444b910440 100644 (file)
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -20,28 +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) == '-'))
                show_usage();
        argv++;
 
-       s=*argv+strlen(*argv)-1;
-       while (s != *argv && *s == '/') {
-               *s-- = '\0';
-       }
-       s = strrchr(*argv, '/');
-       if (s != NULL && s == *argv)
-               s[1] = '\0';
-       else if (s != NULL)
-               *s = '\0';
-       puts(s ? *argv : ".");
+       puts (dirname (argv[0]));
+
        return EXIT_SUCCESS;
 }