emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysctl: recognize ";comment" and "<whitespace>#comment" lines

Browse Source 
function                                             old     new   delta
config_read                                          639     699     +60

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2017-08-05 18:20:34 +02:00
parent 20077c1429
commit 50db1f29bf
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libbb/parse_config.c
View File

@@ -161,13 +161,18 @@ mintokens > 0 make config_read() print error message if less than mintokens
#undef config_read
int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const char *delims)
{
char *line;
char *line, *p;
int ntokens, mintokens;
int t;
char alt_comment_ch;
if (!parser)
return 0;
alt_comment_ch = '\0';
if (flags & PARSE_ALT_COMMENTS)
alt_comment_ch = *delims++;
ntokens = (uint8_t)flags;
mintokens = (uint8_t)(flags >> 8);
@@ -184,7 +189,10 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
if (flags & PARSE_TRIM)
line += strspn(line, delims + 1);
if (line[0] == '\0' || line[0] == delims[0])
p = line;
if (flags & PARSE_WS_COMMENTS)
p = skip_whitespace(p);
if (p[0] == '\0' || p[0] == delims[0] || p[0] == alt_comment_ch)
goto again;
if (flags & PARSE_KEEP_COPY) {