undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

date.c: validate and set time in a helper function

Browse Source 
In a later patch, we will reuse this logic, move it to a helper, now.

While we're at it, explicit states that we intentionally ignore
old-and-defective 2nd leap second.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Đoàn Trần Công Danh 2020-04-24 22:07:30 +07:00 committed by Junio C Hamano
parent c933b28d87
commit 4f89f4fc9a
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
date.c
View File

@ -539,6 +539,20 @@ static int set_date(int year, int month, int day, struct tm *now_tm, time_t now,
return -1; return -1;
} }
static int set_time(long hour, long minute, long second, struct tm *tm)
{
/* We accept 61st second because of leap second */
if (0 <= hour && hour <= 24 &&
0 <= minute && minute < 60 &&
0 <= second && second <= 60) {
tm->tm_hour = hour;
tm->tm_min = minute;
tm->tm_sec = second;
return 0;
}
return -1;
}
static int match_multi_number(timestamp_t num, char c, const char *date, static int match_multi_number(timestamp_t num, char c, const char *date,
char *end, struct tm *tm, time_t now) char *end, struct tm *tm, time_t now)
{ {
@ -556,10 +570,7 @@ static int match_multi_number(timestamp_t num, char c, const char *date,
case ':': case ':':
if (num3 < 0) if (num3 < 0)
num3 = 0; num3 = 0;
if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { if (set_time(num, num2, num3, tm) == 0) {
tm->tm_hour = num;
tm->tm_min = num2;
tm->tm_sec = num3;
break; break;
} }
return 0; return 0;