diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-11-29 11:44:10 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-11-29 11:44:10 +0100 |
| commit | c1005355718055983912ebdd79357b11894e0958 (patch) | |
| tree | f879fd99b2850586ececc83b796d1ab697b3dece /coreutils | |
| parent | 75a1c87357070ec0229f1c98d887bc1c526bb81c (diff) | |
| download | busybox-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')
| -rw-r--r-- | coreutils/cat.c | 6 | ||||
| -rw-r--r-- | coreutils/nl.c | 7 |
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) | |||
| 195 | # define CAT_OPT_b (1<<1) | 195 | # define CAT_OPT_b (1<<1) |
| 196 | if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */ | 196 | if (opts & (CAT_OPT_n|CAT_OPT_b)) { /* -n or -b */ |
| 197 | struct number_state ns; | 197 | struct number_state ns; |
| 198 | int exitcode; | ||
| 198 | 199 | ||
| 199 | ns.width = 6; | 200 | ns.width = 6; |
| 200 | ns.start = 1; | 201 | ns.start = 1; |
| @@ -203,10 +204,11 @@ int cat_main(int argc UNUSED_PARAM, char **argv) | |||
| 203 | ns.empty_str = "\n"; | 204 | ns.empty_str = "\n"; |
| 204 | ns.all = !(opts & CAT_OPT_b); /* -n without -b */ | 205 | ns.all = !(opts & CAT_OPT_b); /* -n without -b */ |
| 205 | ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */ | 206 | ns.nonempty = (opts & CAT_OPT_b); /* -b (with or without -n) */ |
| 207 | exitcode = EXIT_SUCCESS; | ||
| 206 | do { | 208 | do { |
| 207 | print_numbered_lines(&ns, *argv); | 209 | exitcode |= print_numbered_lines(&ns, *argv); |
| 208 | } while (*++argv); | 210 | } while (*++argv); |
| 209 | fflush_stdout_and_exit(EXIT_SUCCESS); | 211 | fflush_stdout_and_exit(exitcode); |
| 210 | } | 212 | } |
| 211 | /*opts >>= 2;*/ | 213 | /*opts >>= 2;*/ |
| 212 | #endif | 214 | #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) | |||
| 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 | } |