Skip to content

Commit

Permalink
date.c: only use the TZ names if we don't have anything better.
Browse files Browse the repository at this point in the history
Also, add EEST (hey, it's Finland).
  • Loading branch information
Linus Torvalds committed Apr 30, 2005
1 parent 5e2a78a commit 92e2311
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion date.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ static const struct {
{ "FWT", +1, 0, }, /* French Winter */
{ "FST", +1, 1, }, /* French Summer */
{ "EET", +2, 0, }, /* Eastern Europe, USSR Zone 1 */
{ "EEST", +2, 1, }, /* Eastern European Daylight */
{ "WAST", +7, 0, }, /* West Australian Standard */
{ "WADT", +7, 1, }, /* West Australian Daylight */
{ "CCT", +8, 0, }, /* China Coast, USSR Zone 7 */
Expand Down Expand Up @@ -144,7 +145,10 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
/* This is bogus, but we like summer */
off += timezone_names[i].dst;

*offset = 60*off;
/* Only use the tz name offset if we don't have anything better */
if (*offset == -1)
*offset = 60*off;

return match;
}
}
Expand Down

0 comments on commit 92e2311

Please sign in to comment.