jfb2 writes in Bug 119:

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

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index b534e6950a4345ae467c9279342b6f444b910440..5136e49092d6cb2d6fd9b93cd9284394457617c5 100644 (file)
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -2,8 +2,7 @@
 /*
  * Mini dirname implementation for busybox
  *
- * Copyright (C) 1999,2000,2001 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
@@ -21,20 +20,20 @@
  *
  */
 
-/* getopt not needed */
+/* 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)
 {
-       if ((argc < 2) || (**(argv + 1) == '-'))
-               show_usage();
-       argv++;
+       if (argc != 2) {
+               bb_show_usage();
+       }
 
-       puts (dirname (argv[0]));
+       puts(dirname(argv[1]));
 
-       return EXIT_SUCCESS;
+       bb_fflush_stdout_and_exit(EXIT_SUCCESS);
 }