diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 02:21:57 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 02:21:57 +0400 |
commit | 92e2311b6c10bf1e4f3e1231d26a6e71d81c5f47 (patch) | |
tree | 3adb7cc8ac221e327b1a3afd5f7f83514dfc6ca8 | |
parent | 5e2a78a4101ec1dafb885c989cc0f958c0de9222 (diff) |
date.c: only use the TZ names if we don't have anything better.
Also, add EEST (hey, it's Finland).
-rw-r--r-- | date.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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; } } |