pygos/cron
1
0
Fork 0
mirror of https://github.com/pygos/cron synced 2024-12-27 15:10:51 +01:00
Code Issues Releases Wiki Activity

Minor cleanup in number parsing

Browse source 
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-11-24 14:02:17 +01:00
parent 1d6b5e58ab
commit a4791171cd
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
rdcron.c
View file

@ -99,42 +99,39 @@ static const struct {
static char *readnum(char *line, int *out, int minval, int maxval, static char *readnum(char *line, int *out, int minval, int maxval,
const enum_map_t *mnemonic, rdline_t *rd) const enum_map_t *mnemonic, rdline_t *rd)
{ {
int i, temp, value = 0; int i, value = 0;
const enum_map_t *ev; const enum_map_t *ev;
if (!isdigit(*line)) { if (isalpha(line[0]) && mnemonic != NULL) {
if (!mnemonic) for (i = 0; isalpha(line[i]); ++i)
goto fail_mn;
for (i = 0; isalnum(line[i]); ++i)
; ;
if (i == 0)
goto fail_mn;
temp = line[i];
line[i] = '\0';
for (ev = mnemonic; ev->name != NULL; ++ev) { for (ev = mnemonic; ev->name != NULL; ++ev) {
if (strcmp(line, ev->name) == 0) if (strncmp(line, ev->name, i) == 0 &&
ev->name[i] == '\0')
break; break;
} }
if (ev->name == NULL) { if (ev->name == NULL) {
rdline_complain(rd, "unexpected '%s'", line); rdline_complain(rd, "unexpected '%.*s'", i, line);
return NULL; return NULL;
} }
line[i] = temp;
*out = ev->value; *out = ev->value;
return line + i; return line + i;
} }
if (!isdigit(line[0]))
goto fail_mn;
while (isdigit(*line)) { while (isdigit(*line)) {
i = ((*(line++)) - '0'); if (value > INT_MAX / 10)
if (value > (maxval - i) / 10)
goto fail_of; goto fail_of;
value = value * 10 + i; value = value * 10 + *(line++) - '0';
} }
if (value > maxval)
goto fail_of;
if (value < minval) if (value < minval)
goto fail_uf; goto fail_uf;
@ -155,7 +152,7 @@ static char *readfield(char *line, uint64_t *out, int minval, int maxval,
const enum_map_t *mnemonic, rdline_t *rd) const enum_map_t *mnemonic, rdline_t *rd)
{ {
int value, endvalue, step; int value, endvalue, step;
uint64_t v = 0; *out = 0;
next: next:
if (*line == '*') { if (*line == '*') {
++line; ++line;
@ -188,7 +185,7 @@ next:
} }
while (value <= endvalue) { while (value <= endvalue) {
v |= 1UL << (unsigned long)(value - minval); *out |= 1UL << (unsigned long)(value - minval);
value += step; value += step;
} }
@ -202,7 +199,6 @@ next:
while (isspace(*line)) while (isspace(*line))
++line; ++line;
*out = v;
return line; return line;
fail: fail:
rdline_complain(rd, "invalid time range expression"); rdline_complain(rd, "invalid time range expression");