aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2018-11-29 11:44:10 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2018-11-29 11:44:10 +0100
commitc1005355718055983912ebdd79357b11894e0958 (patch)
treef879fd99b2850586ececc83b796d1ab697b3dece /coreutils
parent75a1c87357070ec0229f1c98d887bc1c526bb81c (diff)
downloadbusybox-c1005355718055983912ebdd79357b11894e0958.tar.gz
cat,nl: fix handling of open errors
$ cat -n does_not_exist; echo $? cat: does_not_exist: No such file or directory 1 function old new delta print_numbered_lines 118 129 +11 nl_main 196 201 +5 cat_main 421 425 +4 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/0 up/down: 20/0) Total: 20 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/cat.c6
-rw-r--r--coreutils/nl.c7
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);
}