jfb2 writes in Bug 119:

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

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 528b89a56dc6fe7a73585c049dda90b9ddf428d4..5136e49092d6cb2d6fd9b93cd9284394457617c5 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,26 +19,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
  */
-#include "internal.h"
+
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */
+
 #include <stdio.h>
+#include <stdlib.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) {
+               bb_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[1]));
+
+       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 }