rpm2cpio: handle bz2 too; code shrink

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

diff --git a/coreutils/basename.c b/coreutils/basename.c
index ed23779488785ddb5900d19d0d3ec254532241dc..8a5597e65d16e2d0517b39a153d4b9750b19ad34 100644 (file)
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -42,11 +42,12 @@ int basename_main(int argc, char **argv)
                n = strlen(*argv);
                if ((m > n) && ((strcmp)(s+m-n, *argv) == 0)) {
                        m -= n;
-                       s[m] = '\0';
+                       /*s[m] = '\0'; - redundant */
                }
        }
 
        /* puts(s) will do, but we can do without stdio this way: */
        s[m++] = '\n';
-       return full_write(STDOUT_FILENO, s, m) == m;
+       /* NB: != is correct here: */
+       return full_write(STDOUT_FILENO, s, m) != (ssize_t)m;
 }