aboutsummaryrefslogtreecommitdiff
path: root/coreutils/nl.c
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/nl.c
parent75a1c87357070ec0229f1c98d887bc1c526bb81c (diff)
downloadbusybox-w32-c1005355718055983912ebdd79357b11894e0958.tar.gz
busybox-w32-c1005355718055983912ebdd79357b11894e0958.tar.bz2
busybox-w32-c1005355718055983912ebdd79357b11894e0958.zip
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/nl.c')
-rw-r--r--coreutils/nl.c7
1 files changed, 5 insertions, 2 deletions
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)
58 "number-width\0" Required_argument "w" 58 "number-width\0" Required_argument "w"
59 ; 59 ;
60#endif 60#endif
61 int exitcode;
62
61 ns.width = 6; 63 ns.width = 6;
62 ns.start = 1; 64 ns.start = 1;
63 ns.inc = 1; 65 ns.inc = 1;
@@ -72,9 +74,10 @@ int nl_main(int argc UNUSED_PARAM, char **argv)
72 if (!*argv) 74 if (!*argv)
73 *--argv = (char*)"-"; 75 *--argv = (char*)"-";
74 76
77 exitcode = EXIT_SUCCESS;
75 do { 78 do {
76 print_numbered_lines(&ns, *argv); 79 exitcode |= print_numbered_lines(&ns, *argv);
77 } while (*++argv); 80 } while (*++argv);
78 81
79 fflush_stdout_and_exit(EXIT_SUCCESS); 82 fflush_stdout_and_exit(exitcode);
80} 83}