libbb: [x]fopen_for_{read,write} introduced and used.
(by Valdimir) function old new delta config_open2 - 41 +41 config_read 507 542 +35 find_pair 169 187 +18 fopen_for_write - 14 +14 fopen_for_read - 14 +14 find_main 406 418 +12 xfopen_for_write - 10 +10 xfopen_for_read - 10 +10 popstring 134 140 +6 parse_inittab 396 401 +5 next_token 923 928 +5 pack_gzip 1659 1661 +2 bb__parsespent 117 119 +2 fallbackSort 1719 1717 -2 evalvar 1376 1374 -2 qrealloc 36 33 -3 ... ... ... ... singlemount 4579 4569 -10 process_stdin 443 433 -10 patch_main 1111 1101 -10 ifupdown_main 2175 2165 -10 file_action_grep 90 80 -10 uuidcache_init 649 637 -12 hush_main 797 785 -12 read_config 230 217 -13 dpkg_main 3835 3820 -15 read_line_input 3134 3110 -24 sysctl_main 232 203 -29 config_open 40 10 -30 WARN_BAD_LINE 44 - -44 login_main 1714 1575 -139 ------------------------------------------------------------------------------ (add/remove: 5/1 grow/shrink: 8/74 up/down: 174/-737) Total: -563 bytes
This commit is contained in:
@@ -98,10 +98,11 @@ static int sysctl_preload_file_and_exit(const char *filename)
|
||||
if (!parser)
|
||||
return 1;
|
||||
|
||||
while (config_read(parser, token, 2, 0, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too
|
||||
if (!token[1]) {
|
||||
bb_error_msg(WARN_BAD_LINE, filename, parser->lineno);
|
||||
} else {
|
||||
while (config_read(parser, token, 2, 2, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too
|
||||
// if (!token[1]) {
|
||||
// bb_error_msg(WARN_BAD_LINE, filename, parser->lineno);
|
||||
// } else {
|
||||
{
|
||||
#if 0
|
||||
char *s = xasprintf("%s=%s", token[0], token[1]);
|
||||
sysctl_write_setting(s);
|
||||
@@ -205,7 +206,7 @@ static int sysctl_read_setting(const char *name)
|
||||
while ((cptr = strchr(outname, '/')) != NULL)
|
||||
*cptr = '.';
|
||||
|
||||
fp = fopen(tmpname, "r");
|
||||
fp = fopen_for_read(tmpname);
|
||||
if (fp == NULL) {
|
||||
switch (errno) {
|
||||
case ENOENT:
|
||||
|
||||
Reference in New Issue
Block a user