diff options
| author | Alexey Soloviev | 2010-12-31 05:21:51 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2010-12-31 05:21:51 +0100 |
| commit | a5d3d3436b16bf6e1a92ed969e171ac812e8f906 (patch) | |
| tree | a4fe6c805f31f97c445efaa5eb2e8378e7b1540c | |
| parent | a9e25ffa678a357c581b9b7f65a7b2ce1ae2a63e (diff) | |
| download | busybox-a5d3d3436b16bf6e1a92ed969e171ac812e8f906.zip busybox-a5d3d3436b16bf6e1a92ed969e171ac812e8f906.tar.gz | |
date: preserve isdst value if date is in time_t (unix time) format
Signed-off-by: Alexey Soloviev <EXT-Alexey.Soloviev@nokia.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/date.c | 4 | ||||
| -rw-r--r-- | testsuite/date/date-@-works | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index c73fb5b..6ad5f1b 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -282,7 +282,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) } /* Correct any day of week and day of year etc. fields */ - tm_time.tm_isdst = -1; /* Be sure to recheck dst */ + /* Be sure to recheck dst (but not if date is time_t format) */ + if (date_str[0] != '@') + tm_time.tm_isdst = -1; ts.tv_sec = validate_tm_time(date_str, &tm_time); maybe_set_utc(opt); diff --git a/testsuite/date/date-@-works b/testsuite/date/date-@-works new file mode 100644 index 0000000..03b4c7f --- /dev/null +++ b/testsuite/date/date-@-works @@ -0,0 +1,13 @@ +# Tests for time_t value (unix time format) + +# Just before DST switched off +test x"Sun Oct 31 03:59:59 EEST 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1288486799`" + +# Just after DST switched off +test x"Sun Oct 31 03:00:01 EET 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1288486801`" + +# Just before DST switched on +test x"Sun Mar 28 02:59:59 EET 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1269737999`" + +# Just after DST switched on +test x"Sun Mar 28 04:00:01 EEST 2010" = x"`TZ=EET-2EEST,M3.5.0/3,M10.5.0/4 busybox date -d @1269738001`" |