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

Patch from Glenn McGrath to remove code that opens a file but does nothing

Browse Source 
with it.
This commit is contained in:
Rob Landley 2006-02-26 04:42:05 +00:00
parent 5ba2fb2c9d
commit 4217bab02e
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
networking/ifupdown.c
View File

@ -1157,7 +1157,6 @@ extern int ifupdown_main(int argc, char **argv)
{ {
int (*cmds) (struct interface_defn_t *) = NULL; int (*cmds) (struct interface_defn_t *) = NULL;
struct interfaces_file_t *defn; struct interfaces_file_t *defn;
FILE *state_fp = NULL;
llist_t *state_list = NULL; llist_t *state_list = NULL;
llist_t *target_list = NULL; llist_t *target_list = NULL;
const char *interfaces = "/etc/network/interfaces"; const char *interfaces = "/etc/network/interfaces";
@ -1230,10 +1229,6 @@ extern int ifupdown_main(int argc, char **argv)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (no_act) {
state_fp = fopen(statefile, "r");
}
/* Create a list of interfaces to work on */ /* Create a list of interfaces to work on */
if (do_all) { if (do_all) {
if (cmds == iface_up) { if (cmds == iface_up) {
@ -1398,9 +1393,8 @@ extern int ifupdown_main(int argc, char **argv)
/* Actually write the new state */ /* Actually write the new state */
if (!no_act) { if (!no_act) {
FILE *state_fp = NULL;
if (state_fp)
fclose(state_fp);
state_fp = bb_xfopen(statefile, "a+"); state_fp = bb_xfopen(statefile, "a+");
if (ftruncate(fileno(state_fp), 0) < 0) { if (ftruncate(fileno(state_fp), 0) < 0) {
@ -1417,12 +1411,7 @@ extern int ifupdown_main(int argc, char **argv)
state_list = state_list->link; state_list = state_list->link;
} }
fflush(state_fp); fflush(state_fp);
}
/* Cleanup */
if (state_fp != NULL) {
fclose(state_fp); fclose(state_fp);
state_fp = NULL;
} }
if (any_failures) if (any_failures)