Reorganise, make it just one function, remove -v option it didnt work properly anyway...

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

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 63c557a299ba8cc3c695ac891cc15f497e896ee1..387233789993a347d67f986db1131417775d2f05 100644 (file)
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -2,8 +2,8 @@
 /*
  * Mini dirname implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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
@@ -20,26 +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 != *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;
 }