lineedit: do not hang on error, but return error indicator.

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

diff --git a/coreutils/basename.c b/coreutils/basename.c
index 8a5597e65d16e2d0517b39a153d4b9750b19ad34..d441247416ef27b456e7b0527071513aef6f0294 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -4,14 +4,9 @@
  *
  * 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.
  */
 
-/* BB_AUDIT SUSv3 compliant */
-/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
-
-
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
  *
  * Changes:
@@ -20,6 +15,19 @@
  * 3) Save some space by using strcmp().  Calling strncmp() here was silly.
  */
 
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/basename.html */
+
+//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.
+
 #include "libbb.h"
 
 /* This is a NOFORK applet. Be very careful! */
@@ -30,7 +38,7 @@ int basename_main(int argc, char **argv)
        size_t m, n;
        char *s;
 
-       if (((unsigned int)(argc-2)) >= 2) {
+       if ((unsigned)(argc-2) >= 2) {
                bb_show_usage();
        }
 
@@ -40,7 +48,7 @@ int basename_main(int argc, char **argv)
        m = strlen(s);
        if (*++argv) {
                n = strlen(*argv);
-               if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) {
+               if ((m > n) && (strcmp(s+m-n, *argv) == 0)) {
                        m -= n;
                        /*s[m] = '\0'; - redundant */
                }