Convert a chunk of usage.h to USE_ and SKIP_ (more to do there), and fix a

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

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 333f08d41d482ef600fe7515255c67e90c7f560f..dfe40e44b3343c966d5fc37edac96ba7abd76a1f 100644 (file)
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -2,8 +2,7 @@
 /*
  * Mini dirname implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.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,28 +19,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "busybox.h"
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include "busybox.h"
 
-extern int dirname_main(int argc, char **argv)
+int dirname_main(int argc, char **argv)
 {
-       char* s;
+       if (argc != 2) {
+               bb_show_usage();
+       }
 
-       if ((argc < 2) || (**(argv + 1) == '-'))
-               usage(dirname_usage);
-       argv++;
+       puts(dirname(argv[1]));
 
-       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 : ".");
-       return EXIT_SUCCESS;
+       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 }