brctl: tweak help text, fix comments

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

diff --git a/coreutils/basename.c b/coreutils/basename.c
index b79d561c26120202280da7039ec59b5c6d550bb8..0dd2c43c78aaf67f076b2b9ba6f46d86774d24b3 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -4,9 +4,8 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
  * Changes:
@@ -14,39 +13,57 @@
  * 2) Don't check for options, as per SUSv3.
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
+//config:config BASENAME
+//config:      bool "basename (438 bytes)"
+//config:      default y
+//config:      help
+//config:      basename is used to strip the directory and suffix from filenames,
+//config:      leaving just the filename itself. Enable this option if you wish
+//config:      to enable the 'basename' utility.
 
-/* BB_AUDIT SUSv3 compliant */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
+//applet:IF_BASENAME(APPLET_NOFORK(basename, basename, BB_DIR_USR_BIN, BB_SUID_DROP, basename))
 
 //kbuild:lib-$(CONFIG_BASENAME) += basename.o
 
-//config:config BASENAME
-//config:      bool "basename"
-//config:      default y
-//config:      help
-//config:        basename is used to strip the directory and suffix from filenames,
-//config:        leaving just the filename itself. Enable this option if you wish
-//config:        to enable the 'basename' utility.
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
+
+//usage:#define basename_trivial_usage
+//usage:       "FILE [SUFFIX]"
+//usage:#define basename_full_usage "\n\n"
+//usage:       "Strip directory path and .SUFFIX from FILE"
+//usage:
+//usage:#define basename_example_usage
+//usage:       "$ basename /usr/local/bin/foo\n"
+//usage:       "foo\n"
+//usage:       "$ basename /usr/local/bin/\n"
+//usage:       "bin\n"
+//usage:       "$ basename /foo/bar.txt .txt\n"
+//usage:       "bar"
 
 #include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
 
 int basename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int basename_main(int argc, char **argv)
+int basename_main(int argc UNUSED_PARAM, char **argv)
 {
        size_t m, n;
        char *s;
 
-       if ((unsigned)(argc-2) >= 2) {
-               bb_show_usage();
+       if (argv[1] && strcmp(argv[1], "--") == 0) {
+               argv++;
        }
+       if (!argv[1])
+               bb_show_usage();
 
        /* It should strip slash: /abc/def/ -> def */
        s = bb_get_last_path_component_strip(*++argv);
 
        m = strlen(s);
        if (*++argv) {
+               if (argv[1])
+                       bb_show_usage();
                n = strlen(*argv);
                if ((m > n) && (strcmp(s+m-n, *argv) == 0)) {
                        m -= n;