f90ab183d
Denis Vlasenko
2008-03-20
Subject
*: use fopen_or_warn in few more places
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
e2fsprogs/old_e2fsprogs/fsck.c +1 -2networking/interface.c +1 -2networking/libiproute/iproute.c +0 -1shell/hush.c +2 -1
e2fsprogs/old_e2fsprogs/fsck.c+1 -2
| @@ -477,8 +477,7 @@ static void load_fs_info(const char *filename) | |
| int old_fstab = 1; | |
| struct fs_info *fs; | |
| - | if ((f = fopen(filename, "r")) == NULL) { |
| - | bb_perror_msg("WARNING: cannot open %s", filename); |
| + | if ((f = fopen_or_warn(filename, "r")) == NULL) { |
| return; | |
| } | |
| while (!feof(f)) { | |
networking/interface.c+1 -2
| @@ -560,9 +560,8 @@ static int if_readlist_proc(char *target) | |
| if (!target) | |
| proc_read = 1; | |
| - | fh = fopen(_PATH_PROCNET_DEV, "r"); |
| + | fh = fopen_or_warn(_PATH_PROCNET_DEV, "r"); |
| if (!fh) { | |
| - | bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV); |
| return if_readconf(); | |
| } | |
| fgets(buf, sizeof buf, fh); /* eat line */ | |
networking/libiproute/iproute.c+0 -1
| @@ -91,7 +91,6 @@ static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED, | |
| int host_len = -1; | |
| SPRINT_BUF(b1); | |
| - | |
| if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) { | |
| fprintf(stderr, "Not a route: %08x %08x %08x\n", | |
| n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); | |
shell/hush.c+2 -1
| @@ -891,7 +891,8 @@ static int builtin_cd(char **argv) | |
| static int builtin_exec(char **argv) | |
| { | |
| if (argv[1] == NULL) | |
| - | return EXIT_SUCCESS; /* Really? */ |
| + | return EXIT_SUCCESS; /* bash does this */ |
| + | // FIXME: if exec fails, bash does NOT exit! We do... |
| pseudo_exec_argv(argv + 1); | |
| /* never returns */ | |
| } | |