sysctl: fix file parsing, do not require -w for VAR=VAL
function old new delta
sysctl_act_on_setting - 451 +451
sysctl_main 222 282 +60
packed_usage 31744 31793 +49
config_read 604 639 +35
sysctl_act_recursive 612 163 -449
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 3/1 up/down: 595/-449) Total: 146 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 307ae2c..da7482c 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -201,10 +201,10 @@
/* Combine remaining arguments? */
if ((t != (ntokens-1)) || !(flags & PARSE_GREEDY)) {
/* Vanilla token, find next delimiter */
- line += strcspn(line, delims[0] ? delims : delims + 1);
+ line += strcspn(line, (delims[0] && (flags & PARSE_EOL_COMMENTS)) ? delims : delims + 1);
} else {
/* Combining, find comment char if any */
- line = strchrnul(line, PARSE_EOL_COMMENTS ? delims[0] : '\0');
+ line = strchrnul(line, (flags & PARSE_EOL_COMMENTS) ? delims[0] : '\0');
/* Trim any extra delimiters from the end */
if (flags & PARSE_TRIM) {
@@ -214,10 +214,10 @@
}
/* Token not terminated? */
- if (*line == delims[0])
- *line = '\0';
+ if ((flags & PARSE_EOL_COMMENTS) && *line == delims[0])
+ *line = '\0'; /* ends with comment char: this line is done */
else if (*line != '\0')
- *line++ = '\0';
+ *line++ = '\0'; /* token is done, continue parsing line */
#if 0 /* unused so far */
if (flags & PARSE_ESCAPE) {