From 92e2311b6c10bf1e4f3e1231d26a6e71d81c5f47 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 30 Apr 2005 15:21:57 -0700 Subject: date.c: only use the TZ names if we don't have anything better. Also, add EEST (hey, it's Finland). --- date.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/date.c b/date.c index 0022bf2179..d3bae90677 100644 --- a/date.c +++ b/date.c @@ -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 */ @@ -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; } } -- cgit v1.2.3