diff options
Diffstat (limited to 'miscutils')
-rw-r--r-- | miscutils/crond.c | 12 | ||||
-rw-r--r-- | miscutils/fbsplash.c | 4 | ||||
-rw-r--r-- | miscutils/man.c | 1 |
3 files changed, 11 insertions, 6 deletions
diff --git a/miscutils/crond.c b/miscutils/crond.c index b3a06a3..2f0bf6e 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c @@ -469,11 +469,15 @@ static void SynchronizeFile(const char *fileName) file->cf_User = xstrdup(fileName); pline = &file->cf_LineBase; - while (--maxLines - && (n = config_read(parser, tokens, 6, 1, "# \t", PARSE_LAST_IS_GREEDY|PARSE_KEEP_COPY)) - ) { + while (1) { CronLine *line; + if (!--maxLines) + break; + n = config_read(parser, tokens, 6, 1, "# \t", PARSE_NORMAL | PARSE_KEEP_COPY); + if (!n) + break; + if (DebugOpt) crondlog(LVL5 "user:%s entry:%s", fileName, parser->data); @@ -488,7 +492,7 @@ static void SynchronizeFile(const char *fileName) /* check if a minimum of tokens is specified */ if (n < 6) continue; - *pline = line = xzalloc(sizeof(CronLine)); + *pline = line = xzalloc(sizeof(*line)); /* parse date ranges */ ParseField(file->cf_User, line->cl_Mins, 60, 0, NULL, tokens[0]); ParseField(file->cf_User, line->cl_Hrs, 24, 0, NULL, tokens[1]); diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c index 6357f78..f8289c3 100644 --- a/miscutils/fbsplash.c +++ b/miscutils/fbsplash.c @@ -288,10 +288,10 @@ static void init(const char *cfg_filename) "DEBUG\0" #endif ; - char *token[2]; parser_t *parser = config_open2(cfg_filename, xfopen_stdin); - while (config_read(parser, token, 2, 2, "#=", PARSE_MIN_DIE)) { + while (config_read(parser, token, 2, 2, "#=", + (PARSE_NORMAL | PARSE_MIN_DIE) & ~(PARSE_TRIM | PARSE_COLLAPSE))) { unsigned val = xatoi_u(token[1]); int i = index_in_strings(param_names, token[0]); if (i < 0) diff --git a/miscutils/man.c b/miscutils/man.c index 7ef5941..adb85b8 100644 --- a/miscutils/man.c +++ b/miscutils/man.c @@ -82,6 +82,7 @@ int man_main(int argc UNUSED_PARAM, char **argv) char *cur_path, *cur_sect; int count_mp, cur_mp; int opt, not_found; + char *token[2]; opt_complementary = "-1"; /* at least one argument */ opt = getopt32(argv, "+aw"); |