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 /util-linux | |
| parent | 8895c2073e9341d8e0348365e75ba6aa4b9b8d05 (diff) | |
| download | busybox-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 'util-linux')
| -rw-r--r-- | util-linux/hexdump.c | 16 | ||||
| -rw-r--r-- | util-linux/mdev.c | 6 |
2 files changed, 13 insertions, 9 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 8ac12f082..48edd70a9 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c | |||
| @@ -16,11 +16,19 @@ | |||
| 16 | 16 | ||
| 17 | static void bb_dump_addfile(dumper_t *dumper, char *name) | 17 | static void bb_dump_addfile(dumper_t *dumper, char *name) |
| 18 | { | 18 | { |
| 19 | parser_t *parser = config_open2(name, xfopen_for_read); | 19 | char *p; |
| 20 | while (config_read(parser, &name, 1, 1, "# \t", 0)) { | 20 | FILE *fp; |
| 21 | bb_dump_add(dumper, name); | 21 | char *buf; |
| 22 | |||
| 23 | fp = xfopen_for_read(name); | ||
| 24 | while ((buf = xmalloc_fgetline(fp)) != NULL) { | ||
| 25 | p = skip_whitespace(buf); | ||
| 26 | if (*p && (*p != '#')) { | ||
| 27 | bb_dump_add(dumper, p); | ||
| 28 | } | ||
| 29 | free(buf); | ||
| 22 | } | 30 | } |
| 23 | config_close(parser); | 31 | fclose(fp); |
| 24 | } | 32 | } |
| 25 | 33 | ||
| 26 | static const char *const add_strings[] = { | 34 | static const char *const add_strings[] = { |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index f6440b190..d0d010382 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
| @@ -107,10 +107,7 @@ static void make_device(char *path, int delete) | |||
| 107 | parser = config_open2("/etc/mdev.conf", fopen_for_read); | 107 | parser = config_open2("/etc/mdev.conf", fopen_for_read); |
| 108 | 108 | ||
| 109 | /* If we have config file, look up user settings */ | 109 | /* If we have config file, look up user settings */ |
| 110 | if (!parser) | 110 | while (config_read(parser, tokens, 4, 3, "# \t", PARSE_NORMAL)) { |
| 111 | goto end_parse; | ||
| 112 | |||
| 113 | while (config_read(parser, tokens, 4, 3, "# \t", PARSE_LAST_IS_GREEDY)) { | ||
| 114 | regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; | 111 | regmatch_t off[1 + 9*ENABLE_FEATURE_MDEV_RENAME_REGEXP]; |
| 115 | char *val; | 112 | char *val; |
| 116 | 113 | ||
| @@ -244,7 +241,6 @@ static void make_device(char *path, int delete) | |||
| 244 | } /* end of "while line is read from /etc/mdev.conf" */ | 241 | } /* end of "while line is read from /etc/mdev.conf" */ |
| 245 | 242 | ||
| 246 | config_close(parser); | 243 | config_close(parser); |
| 247 | end_parse: | ||
| 248 | #endif /* ENABLE_FEATURE_MDEV_CONF */ | 244 | #endif /* ENABLE_FEATURE_MDEV_CONF */ |
| 249 | 245 | ||
| 250 | if (!delete && sscanf(dev_maj_min, "%u:%u", &major, &minor) == 2) { | 246 | if (!delete && sscanf(dev_maj_min, "%u:%u", &major, &minor) == 2) { |
