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

Merge branch 'mc/maint-zoneparse'

Browse Source 
* mc/maint-zoneparse:
  Add "Z" as an alias for the timezone "UTC"
This commit is contained in:
Junio C Hamano 2010-06-13 11:22:30 -07:00
commit cde3eadad2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
date.c
View File

@ -229,6 +229,7 @@ static const struct {
{ "GMT", 0, 0, }, /* Greenwich Mean */ { "GMT", 0, 0, }, /* Greenwich Mean */
{ "UTC", 0, 0, }, /* Universal (Coordinated) */ { "UTC", 0, 0, }, /* Universal (Coordinated) */
{ "Z", 0, 0, }, /* Zulu, alias for UTC */
{ "WET", 0, 0, }, /* Western European */ { "WET", 0, 0, }, /* Western European */
{ "BST", 0, 1, }, /* British Summer */ { "BST", 0, 1, }, /* British Summer */
@ -305,7 +306,7 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
for (i = 0; i < ARRAY_SIZE(timezone_names); i++) { for (i = 0; i < ARRAY_SIZE(timezone_names); i++) {
int match = match_string(date, timezone_names[i].name); int match = match_string(date, timezone_names[i].name);
if (match >= 3) { if (match >= 3 || match == strlen(timezone_names[i].name)) {
int off = timezone_names[i].offset; int off = timezone_names[i].offset;
/* This is bogus, but we like summer */ /* This is bogus, but we like summer */