ahp/busybox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

*: use fopen_or_warn in few more places

Browse source
This commit is contained in:
Denis Vlasenko 2008-03-20 21:19:35 +00:00
parent 275b929e01
commit f90ab183d6
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
e2fsprogs/old_e2fsprogs/fsck.c
View file

@ -477,8 +477,7 @@ static void load_fs_info(const char *filename)
int old_fstab = 1; int old_fstab = 1;
struct fs_info *fs; struct fs_info *fs;
if ((f = fopen(filename, "r")) == NULL) { if ((f = fopen_or_warn(filename, "r")) == NULL) {
bb_perror_msg("WARNING: cannot open %s", filename);
return; return;
} }
while (!feof(f)) { while (!feof(f)) {

3
networking/interface.c
View file

@ -560,9 +560,8 @@ static int if_readlist_proc(char *target)
if (!target) if (!target)
proc_read = 1; proc_read = 1;
fh = fopen(_PATH_PROCNET_DEV, "r"); fh = fopen_or_warn(_PATH_PROCNET_DEV, "r");
if (!fh) { if (!fh) {
bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV);
return if_readconf(); return if_readconf();
} }
fgets(buf, sizeof buf, fh); /* eat line */ fgets(buf, sizeof buf, fh); /* eat line */

1
networking/libiproute/iproute.c
View file

@ -91,7 +91,6 @@ static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED,
int host_len = -1; int host_len = -1;
SPRINT_BUF(b1); SPRINT_BUF(b1);
if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) { if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
fprintf(stderr, "Not a route: %08x %08x %08x\n", fprintf(stderr, "Not a route: %08x %08x %08x\n",
n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);

3
shell/hush.c
View file

@ -891,7 +891,8 @@ static int builtin_cd(char **argv)
static int builtin_exec(char **argv) static int builtin_exec(char **argv)
{ {
if (argv[1] == NULL) 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); pseudo_exec_argv(argv + 1);
/* never returns */ /* never returns */
} }