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

catv: was abusing xopen, should not die on err, but warn only.

Browse Source
This commit is contained in:
Denis Vlasenko 2007-06-12 08:13:34 +00:00
parent cc5e090f12
commit 16d58d75ee
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
coreutils/catv.c
View File

@ -23,14 +23,20 @@ int catv_main(int argc, char **argv)
#define CATV_OPT_t (1<<1) #define CATV_OPT_t (1<<1)
#define CATV_OPT_v (1<<2) #define CATV_OPT_v (1<<2)
flags ^= CATV_OPT_v; flags ^= CATV_OPT_v;
argv += optind; argv += optind;
do {
/* Read from stdin if there's nothing else to do. */ /* Read from stdin if there's nothing else to do. */
fd = 0; fd = 0;
if (*argv && 0 > (fd = xopen(*argv, O_RDONLY))) if (!argv[0])
goto jump_in;
do {
fd = open_or_warn(*argv, O_RDONLY);
if (fd < 0) {
retval = EXIT_FAILURE; retval = EXIT_FAILURE;
else for (;;) { continue;
}
jump_in:
for (;;) {
int i, res; int i, res;
#define read_buf bb_common_bufsiz1 #define read_buf bb_common_bufsiz1
@ -46,11 +52,10 @@ int catv_main(int argc, char **argv)
if (c == 127) { if (c == 127) {
printf("^?"); printf("^?");
continue; continue;
} else { }
printf("M-"); printf("M-");
c -= 128; c -= 128;
} }
}
if (c < 32) { if (c < 32) {
if (c == 10) { if (c == 10) {
if (flags & CATV_OPT_e) if (flags & CATV_OPT_e)