From c1005355718055983912ebdd79357b11894e0958 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 29 Nov 2018 11:44:10 +0100 Subject: 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 --- coreutils/cat.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'coreutils/cat.c') 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 -- cgit v1.2.3