libbb: get rid of statics in dump.c; code shrinks a lot too

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

diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index ceb750cb8a81093af6c3442b921281919a7f89a6..c0c0925e5bc96a34f3e2d8127478dc232e4b9100 100644 (file)
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -2,43 +2,26 @@
 /*
  * Mini dirname implementation for busybox
  *
- * Copyright (C) 2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
-#include "busybox.h"
-#include <stdio.h>
 
-extern int dirname_main(int argc, char **argv)
-{
-       char* s;
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/dirname.html */
 
-       if ((argc < 2) || (**(argv + 1) == '-'))
-               usage(dirname_usage);
-       argv++;
+#include "libbb.h"
 
-       s=*argv+strlen(*argv)-1;
-       while (s && *s == '/') {
-               *s = '\0';
-               s=*argv+strlen(*argv)-1;
+/* This is a NOFORK applet. Be very careful! */
+
+int dirname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int dirname_main(int argc, char **argv)
+{
+       if (argc != 2) {
+               bb_show_usage();
        }
-       s = strrchr(*argv, '/');
-       if (s && *s)
-               *s = '\0';
-       printf("%s\n", (s)? *argv : ".");
-       return EXIT_SUCCESS;
+
+       puts(dirname(argv[1]));
+
+       return fflush(stdout);
 }