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/nl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'coreutils/nl.c') 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); } -- cgit v1.2.3