emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cat,nl: fix handling of open errors

Browse Source 
$ 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>
This commit is contained in:
Denys Vlasenko
2018-11-29 11:44:10 +01:00
parent 75a1c87357
commit c100535571
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/cat.c
View File

@ -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