aboutsummaryrefslogtreecommitdiff
path: root/networking/nameif.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-26 23:08:31 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-26 23:08:31 +0000
commit084266ed520805bbc4ec3f9b4d14e644ecd75880 (patch)
treefe2c8531dc039c81c12a39f39fcfdf6c1b8ec996 /networking/nameif.c
parent8895c2073e9341d8e0348365e75ba6aa4b9b8d05 (diff)
downloadbusybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.gz
busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.bz2
busybox-w32-084266ed520805bbc4ec3f9b4d14e644ecd75880.zip
fix several problems with config parser:
a bug where it underflows the string a bug where it never frees parser_t struct make read_config() return 0 if parser is NULL, make config_close() accept and ignore NULL parser - eliminates many if() blocks reverse the sense of parser bit flags - negative flags are harder to grok. hexdump: revert the change to use config parser, it is BIGGER and also requires additional quirks in parser *: explicitly use PARSER_NORMAL instead of 0 function old new delta login_main 1575 1596 +21 config_close 18 29 +11 bbunpack 383 391 +8 qgravechar 106 109 +3 rtnl_tab_initialize 121 117 -4 expand 1697 1693 -4 man_main 717 712 -5 nameif_main 674 668 -6 hexdump_main 597 591 -6 read_config 217 209 -8 dnsd_main 1478 1470 -8 sysctl_main 203 189 -14 config_open2 44 25 -19 make_device 1177 1141 -36 config_read 597 549 -48 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 4/11 up/down: 43/-158) Total: -115 bytes
Diffstat (limited to 'networking/nameif.c')
-rw-r--r--networking/nameif.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/networking/nameif.c b/networking/nameif.c
index 5a3bd606f..12c08f13b 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -160,13 +160,11 @@ int nameif_main(int argc, char **argv)
160 prepend_new_eth_table(&clist, ifname, *argv++); 160 prepend_new_eth_table(&clist, ifname, *argv++);
161 } 161 }
162 } else { 162 } else {
163 char *tokens[2];
163 struct parser_t *parser = config_open(fname); 164 struct parser_t *parser = config_open(fname);
164 if (parser) { 165 while (config_read(parser, tokens, 2, 2, "# \t", PARSE_NORMAL))
165 char *tokens[2]; 166 prepend_new_eth_table(&clist, tokens[0], tokens[1]);
166 while (config_read(parser, tokens, 2, 2, "# \t", 0)) 167 config_close(parser);
167 prepend_new_eth_table(&clist, tokens[0], tokens[1]);
168 config_close(parser);
169 }
170 } 168 }
171 169
172 ctl_sk = xsocket(PF_INET, SOCK_DGRAM, 0); 170 ctl_sk = xsocket(PF_INET, SOCK_DGRAM, 0);