diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 21:19:35 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-20 21:19:35 +0000 |
| commit | f90ab183d63c64fd2c35f00d65aedbaae8402740 (patch) | |
| tree | 717976261ccdb8e7ab68c79def5ea10936c0dcd3 | |
| parent | 275b929e0157c7e40a66df108b1e1954b59a2bdf (diff) | |
| download | busybox-w32-f90ab183d63c64fd2c35f00d65aedbaae8402740.tar.gz busybox-w32-f90ab183d63c64fd2c35f00d65aedbaae8402740.tar.bz2 busybox-w32-f90ab183d63c64fd2c35f00d65aedbaae8402740.zip | |
*: use fopen_or_warn in few more places
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/fsck.c | 3 | ||||
| -rw-r--r-- | networking/interface.c | 3 | ||||
| -rw-r--r-- | networking/libiproute/iproute.c | 1 | ||||
| -rw-r--r-- | shell/hush.c | 3 |
4 files changed, 4 insertions, 6 deletions
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c index d4914a571..a51c33a1c 100644 --- a/e2fsprogs/old_e2fsprogs/fsck.c +++ b/e2fsprogs/old_e2fsprogs/fsck.c | |||
| @@ -477,8 +477,7 @@ static void load_fs_info(const char *filename) | |||
| 477 | int old_fstab = 1; | 477 | int old_fstab = 1; |
| 478 | struct fs_info *fs; | 478 | struct fs_info *fs; |
| 479 | 479 | ||
| 480 | if ((f = fopen(filename, "r")) == NULL) { | 480 | if ((f = fopen_or_warn(filename, "r")) == NULL) { |
| 481 | bb_perror_msg("WARNING: cannot open %s", filename); | ||
| 482 | return; | 481 | return; |
| 483 | } | 482 | } |
| 484 | while (!feof(f)) { | 483 | while (!feof(f)) { |
diff --git a/networking/interface.c b/networking/interface.c index 367d2b0bc..44bd8d3d9 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
| @@ -560,9 +560,8 @@ static int if_readlist_proc(char *target) | |||
| 560 | if (!target) | 560 | if (!target) |
| 561 | proc_read = 1; | 561 | proc_read = 1; |
| 562 | 562 | ||
| 563 | fh = fopen(_PATH_PROCNET_DEV, "r"); | 563 | fh = fopen_or_warn(_PATH_PROCNET_DEV, "r"); |
| 564 | if (!fh) { | 564 | if (!fh) { |
| 565 | bb_perror_msg("warning: cannot open %s, limiting output", _PATH_PROCNET_DEV); | ||
| 566 | return if_readconf(); | 565 | return if_readconf(); |
| 567 | } | 566 | } |
| 568 | fgets(buf, sizeof buf, fh); /* eat line */ | 567 | fgets(buf, sizeof buf, fh); /* eat line */ |
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 5ded99b2e..670f188ee 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c | |||
| @@ -91,7 +91,6 @@ static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED, | |||
| 91 | int host_len = -1; | 91 | int host_len = -1; |
| 92 | SPRINT_BUF(b1); | 92 | SPRINT_BUF(b1); |
| 93 | 93 | ||
| 94 | |||
| 95 | if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) { | 94 | if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) { |
| 96 | fprintf(stderr, "Not a route: %08x %08x %08x\n", | 95 | fprintf(stderr, "Not a route: %08x %08x %08x\n", |
| 97 | n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); | 96 | n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); |
diff --git a/shell/hush.c b/shell/hush.c index 2d5697269..4e6d50094 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -891,7 +891,8 @@ static int builtin_cd(char **argv) | |||
| 891 | static int builtin_exec(char **argv) | 891 | static int builtin_exec(char **argv) |
| 892 | { | 892 | { |
| 893 | if (argv[1] == NULL) | 893 | if (argv[1] == NULL) |
| 894 | return EXIT_SUCCESS; /* Really? */ | 894 | return EXIT_SUCCESS; /* bash does this */ |
| 895 | // FIXME: if exec fails, bash does NOT exit! We do... | ||
| 895 | pseudo_exec_argv(argv + 1); | 896 | pseudo_exec_argv(argv + 1); |
| 896 | /* never returns */ | 897 | /* never returns */ |
| 897 | } | 898 | } |
