diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 23:08:31 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-26 23:08:31 +0000 |
| commit | 084266ed520805bbc4ec3f9b4d14e644ecd75880 (patch) | |
| tree | fe2c8531dc039c81c12a39f39fcfdf6c1b8ec996 /networking/libiproute | |
| parent | 8895c2073e9341d8e0348365e75ba6aa4b9b8d05 (diff) | |
| download | busybox-084266ed520805bbc4ec3f9b4d14e644ecd75880.tar.gz | |
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/libiproute')
| -rw-r--r-- | networking/libiproute/rt_names.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/networking/libiproute/rt_names.c b/networking/libiproute/rt_names.c index 1a2d52e86..e4d10613b 100644 --- a/networking/libiproute/rt_names.c +++ b/networking/libiproute/rt_names.c @@ -20,9 +20,7 @@ static void rtnl_tab_initialize(const char *file, const char **tab, int size) { char *token[2]; parser_t *parser = config_open2(file, fopen_for_read); - if (!parser) - return; - while (config_read(parser, token, 2, 2, "# \t", 0)) { + while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) { int id = bb_strtou(token[0], NULL, 0); if (id < 0 || id > size) { bb_error_msg("database %s is corrupted at line %d", |