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

Fix approxidate() to understand 12:34 AM/PM are 00:34 and 12:34

Browse Source 
It just simplifies the whole thing to say

	"hour = (hour % 12) + X"

where X is 12 for PM and 0 for AM.

It also fixes the "exact date" parsing, which didn't parse AM at all, and
as such would do the same "12:30 AM" means "12:30 24-hour-format" bug. Of
course, I hope that no exact dates use AM/PM anyway, but since we support
the PM format, let's just get it right.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2006-09-29 12:36:13 -07:00 committed by Junio C Hamano
parent bc1a580757
commit 18b633cafc
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
date.c
View File

@ -256,8 +256,12 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
} }
if (match_string(date, "PM") == 2) { if (match_string(date, "PM") == 2) {
if (tm->tm_hour > 0 && tm->tm_hour < 12) tm->tm_hour = (tm->tm_hour % 12) + 12;
tm->tm_hour += 12; return 2;
}
if (match_string(date, "AM") == 2) {
tm->tm_hour = (tm->tm_hour % 12) + 0;
return 2; return 2;
} }
@ -600,28 +604,30 @@ static void date_tea(struct tm *tm, int *num)
static void date_pm(struct tm *tm, int *num) static void date_pm(struct tm *tm, int *num)
{ {
int hour = *num; int hour, n = *num;
*num = 0; *num = 0;
if (hour > 0 && hour < 12) { hour = tm->tm_hour;
tm->tm_hour = hour; if (n) {
hour = n;
tm->tm_min = 0; tm->tm_min = 0;
tm->tm_sec = 0; tm->tm_sec = 0;
} }
if (tm->tm_hour > 0 && tm->tm_hour < 12) tm->tm_hour = (hour % 12) + 12;
tm->tm_hour += 12;
} }
static void date_am(struct tm *tm, int *num) static void date_am(struct tm *tm, int *num)
{ {
int hour = *num; int hour, n = *num;
*num = 0; *num = 0;
if (hour > 0 && hour < 12) { hour = tm->tm_hour;
tm->tm_hour = hour; if (n) {
hour = n;
tm->tm_min = 0; tm->tm_min = 0;
tm->tm_sec = 0; tm->tm_sec = 0;
} }
tm->tm_hour = (hour % 12);
} }
static const struct special { static const struct special {