summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-19 09:27:19 +0000
committerDenis Vlasenko2008-07-19 09:27:19 +0000
commit2e157ddf9ecd9d58864425f0e87409ddc218df94 (patch)
tree18f415d4847897a12d790b545f94c32ae68c199c /init
parentbd28f6bf7f53ede8df39112d40cb52f2a3d00177 (diff)
downloadbusybox-2e157ddf9ecd9d58864425f0e87409ddc218df94.zip
busybox-2e157ddf9ecd9d58864425f0e87409ddc218df94.tar.gz
libbb: updated config_parse() from Vladimir
function old new delta config_read 385 460 +75 runsvdir_main 1701 1716 +15 readit 331 338 +7 passwd_main 1049 1053 +4 parse_command 1504 1507 +3 decode_format_string 822 824 +2 bb__parsespent 117 119 +2 udhcp_get_option 221 222 +1 changepath 196 194 -2 parse_inittab 400 396 -4 nameif_main 683 679 -4 make_device 1176 1172 -4 config_open 48 40 -8 expand_main 698 689 -9 readcmd 1012 1002 -10 config_free_data 37 21 -16 SynchronizeFile 683 643 -40 sleep_main 474 362 -112 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 8/10 up/down: 109/-209) Total: -100 bytes
Diffstat (limited to 'init')
-rw-r--r--init/init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/init.c b/init/init.c
index 9637589..0e4a8f1 100644
--- a/init/init.c
+++ b/init/init.c
@@ -808,7 +808,7 @@ static void parse_inittab(void)
/* optional_tty:ignored_runlevel:action:command
* Delims are not to be collapsed and need exactly 4 tokens
*/
- while (config_read(parser, token, -4, 0, ":", '#') >= 0) {
+ while (config_read(parser, token, 4, 0, "#:", PARSE_DONT_TRIM|PARSE_DONT_REDUCE|PARSE_LAST_IS_GREEDY)) {
int action;
char *tty = token[0];
@@ -828,7 +828,7 @@ static void parse_inittab(void)
free(tty);
continue;
bad_entry:
- message(L_LOG | L_CONSOLE, "Bad inittab entry: %s", parser->line);
+ message(L_LOG | L_CONSOLE, "Bad inittab entry at line %d", parser->lineno);
}
config_close(parser);
#endif