vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

valid_temp_time: style fixes

Browse source
This commit is contained in:
Ed Kellett 2022-03-06 16:44:45 +00:00
parent 2644dcd166
commit 492d560ee1
1 changed files with 31 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
ircd/s_newconf.c
View file

@ -686,42 +686,43 @@ valid_temp_time(const char *p)
{ {
time_t result = 0; time_t result = 0;
long current = 0; long current = 0;
char *ch = strdup(p), *och;
while (*ch) { while (*p) {
och = ch; char *endp;
current = strtol(ch, &ch, 10);
errno = 0;
current = strtol(p, &endp, 10);
if (errno == ERANGE) if (errno == ERANGE)
return -1; return -1;
if (och == ch) if (endp == p)
/* No numbers were given so return invalid */ return -1;
switch (*endp) {
case '\0': /* No unit was given so send it back as minutes */
case 'm':
result += current * 60;
break;
case 'h':
result += current * 3600;
break;
case 'd':
result += current * 86400;
break;
case 'w':
result += current * 604800;
break;
default:
return -1; return -1;
if (current) {
switch (*ch) {
case '\0': /* No unit was given so send it back as minutes */
case 'm':
result += (current * 60);
break;
case 'h':
result += (current * 3600);
break;
case 'd':
result += (current * 86400);
break;
case 'w':
result += (current * 604800);
break;
default:
/* Bad time unit was given */
return -1;
}
if (*ch++ == '\0')
break;
} }
if (*endp == '\0')
break;
p = endp + 1;
} }
if(result > (60 * 60 * 24 * 7 * 52))
result = (60 * 60 * 24 * 7 * 52); return MIN(result, 60 * 60 * 24 * 7 * 52);
return result;
} }
/* Propagated bans are expired elsewhere. */ /* Propagated bans are expired elsewhere. */