aboutsummaryrefslogtreecommitdiff
path: root/miscutils
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 /miscutils
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 'miscutils')
-rw-r--r--miscutils/crond.c12
-rw-r--r--miscutils/fbsplash.c4
-rw-r--r--miscutils/man.c1
3 files changed, 11 insertions, 6 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c
index b3a06a376..2f0bf6ea8 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -469,11 +469,15 @@ static void SynchronizeFile(const char *fileName)
469 file->cf_User = xstrdup(fileName); 469 file->cf_User = xstrdup(fileName);
470 pline = &file->cf_LineBase; 470 pline = &file->cf_LineBase;
471 471
472 while (--maxLines 472 while (1) {
473 && (n = config_read(parser, tokens, 6, 1, "# \t", PARSE_LAST_IS_GREEDY|PARSE_KEEP_COPY))
474 ) {
475 CronLine *line; 473 CronLine *line;
476 474
475 if (!--maxLines)
476 break;
477 n = config_read(parser, tokens, 6, 1, "# \t", PARSE_NORMAL | PARSE_KEEP_COPY);
478 if (!n)
479 break;
480
477 if (DebugOpt) 481 if (DebugOpt)
478 crondlog(LVL5 "user:%s entry:%s", fileName, parser->data); 482 crondlog(LVL5 "user:%s entry:%s", fileName, parser->data);
479 483
@@ -488,7 +492,7 @@ static void SynchronizeFile(const char *fileName)
488 /* check if a minimum of tokens is specified */ 492 /* check if a minimum of tokens is specified */
489 if (n < 6) 493 if (n < 6)
490 continue; 494 continue;
491 *pline = line = xzalloc(sizeof(CronLine)); 495 *pline = line = xzalloc(sizeof(*line));
492 /* parse date ranges */ 496 /* parse date ranges */
493 ParseField(file->cf_User, line->cl_Mins, 60, 0, NULL, tokens[0]); 497 ParseField(file->cf_User, line->cl_Mins, 60, 0, NULL, tokens[0]);
494 ParseField(file->cf_User, line->cl_Hrs, 24, 0, NULL, tokens[1]); 498 ParseField(file->cf_User, line->cl_Hrs, 24, 0, NULL, tokens[1]);
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 6357f78ea..f8289c3d1 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -288,10 +288,10 @@ static void init(const char *cfg_filename)
288 "DEBUG\0" 288 "DEBUG\0"
289#endif 289#endif
290 ; 290 ;
291
292 char *token[2]; 291 char *token[2];
293 parser_t *parser = config_open2(cfg_filename, xfopen_stdin); 292 parser_t *parser = config_open2(cfg_filename, xfopen_stdin);
294 while (config_read(parser, token, 2, 2, "#=", PARSE_MIN_DIE)) { 293 while (config_read(parser, token, 2, 2, "#=",
294 (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) {
295 unsigned val = xatoi_u(token[1]); 295 unsigned val = xatoi_u(token[1]);
296 int i = index_in_strings(param_names, token[0]); 296 int i = index_in_strings(param_names, token[0]);
297 if (i < 0) 297 if (i < 0)
diff --git a/miscutils/man.c b/miscutils/man.c
index 7ef5941a1..adb85b81c 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -82,6 +82,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
82 char *cur_path, *cur_sect; 82 char *cur_path, *cur_sect;
83 int count_mp, cur_mp; 83 int count_mp, cur_mp;
84 int opt, not_found; 84 int opt, not_found;
85 char *token[2];
85 86
86 opt_complementary = "-1"; /* at least one argument */ 87 opt_complementary = "-1"; /* at least one argument */
87 opt = getopt32(argv, "+aw"); 88 opt = getopt32(argv, "+aw");