Merge branch 'busybox' into merge

2 files changed, 9 insertions, 4 deletions

diff --git a/coreutils/cat.c b/coreutils/cat.c
index fb735f994..65f0648f9 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -195,6 +195,7 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
 # define CAT_OPT_b (1<<1)
         if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */
                 struct number_state ns;
+                int exitcode;
 
                 ns.width = 6;
                 ns.start = 1;
@@ -203,10 +204,11 @@ int cat_main(int argc UNUSED_PARAM, char **argv)
                 ns.empty_str = "\n";
                 ns.all = !(opts & CAT_OPT_b); /* -n without -b */
                 ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */
+                exitcode = EXIT_SUCCESS;
                 do {
-                        print_numbered_lines(&ns, *argv);
+                        exitcode |= print_numbered_lines(&ns, *argv);
                 } while (*++argv);
-                fflush_stdout_and_exit(EXIT_SUCCESS);
+                fflush_stdout_and_exit(exitcode);
         }
         /*opts >>= 2;*/
 #endif
diff --git a/coreutils/nl.c b/coreutils/nl.c
index c2f8b1042..2fdc9d85e 100644
--- a/coreutils/nl.c
+++ b/coreutils/nl.c
@@ -58,6 +58,8 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
                 "number-width\0"        Required_argument "w"
         ;
 #endif
+        int exitcode;
+
         ns.width = 6;
         ns.start = 1;
         ns.inc = 1;
@@ -72,9 +74,10 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
         if (!*argv)
                 *--argv = (char*)"-";
 
+        exitcode = EXIT_SUCCESS;
         do {
-                print_numbered_lines(&ns, *argv);
+                exitcode |= print_numbered_lines(&ns, *argv);
         } while (*++argv);
 
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit(exitcode);
 }