rpm2cpio: handle bz2 too; code shrink

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

diff --git a/coreutils/basename.c b/coreutils/basename.c
index ec1f85befd94324f86c7a0ac1304f94aa6a7bf7c..8a5597e65d16e2d0517b39a153d4b9750b19ad34 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -24,7 +24,7 @@
 
 /* This is a NOFORK applet. Be very careful! */
 
-int basename_main(int argc, char **argv);
+int basename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int basename_main(int argc, char **argv)
 {
        size_t m, n;
@@ -37,15 +37,17 @@ int basename_main(int argc, char **argv)
        /* It should strip slash: /abc/def/ -> def */
        s = bb_get_last_path_component_strip(*++argv);
 
+       m = strlen(s);
        if (*++argv) {
                n = strlen(*argv);
-               m = strlen(s);
                if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) {
-                       s[m-n] = '\0';
+                       m -= n;
+                       /*s[m] = '\0'; - redundant */
                }
        }
 
-       puts(s);
-
-       return fflush(stdout);
+       /* puts(s) will do, but we can do without stdio this way: */
+       s[m++] = '\n';
+       /* NB: != is correct here: */
+       return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
 }