diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | generic/tclClock.c | 4 | ||||
| -rw-r--r-- | tests/clock.test | 23 |
3 files changed, 28 insertions, 3 deletions
@@ -2,6 +2,10 @@ * doc/clock.n: Corrected a buglet in the header information. [Bug 1024058] + * generic/tclClock.c (TclClockMktimeObjCmd): Fixed a bug where + the month was scanned incorrectly in -timezone :localtime. + * tests/clock.test (clock-40.1): Added regression test case for + the bug where month was scanned incorrectly in -timezone :localtime. 2004-09-07 David Gravereaux <davygrvy@pobox.com> diff --git a/generic/tclClock.c b/generic/tclClock.c index 3fa51ae..e348d58 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclClock.c,v 1.30 2004/08/18 21:29:12 kennykb Exp $ + * RCS: @(#) $Id: tclClock.c,v 1.31 2004/09/08 15:38:33 kennykb Exp $ */ #include "tclInt.h" @@ -239,7 +239,7 @@ TclClockMktimeObjCmd( ClientData clientData, if ( Tcl_GetIntFromObj( interp, objv[2], &i ) != TCL_OK ) { return TCL_ERROR; } - toConvert.tm_mon = i; + toConvert.tm_mon = i - 1; if ( Tcl_GetIntFromObj( interp, objv[3], &i ) != TCL_OK ) { return TCL_ERROR; } diff --git a/tests/clock.test b/tests/clock.test index 0fa42b6..15647d9 100644 --- a/tests/clock.test +++ b/tests/clock.test @@ -11,7 +11,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: clock.test,v 1.40 2004/09/07 17:38:59 kennykb Exp $ +# RCS: @(#) $Id: clock.test,v 1.41 2004/09/08 15:38:35 kennykb Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -35236,6 +35236,27 @@ test clock-39.1 {regression - synonym timezones} { clock format 0 -format {%H:%M:%S} -timezone :US/Eastern } {19:00:00} +test clock-40.1 {regression - bad month with -timezone :localtime} \ + -setup { + if { [info exists env(TZ)] } { + set oldTZ $env(TZ) + } + set env(TZ) UTC0 + } \ + -body { + clock scan 1970-01-01T00:00:00 -timezone :localtime \ + -format %Y-%m-%dT%H:%M:%S + } \ + -cleanup { + if { [info exists oldTZ] } { + set env(TZ) $oldTZ + unset oldTZ + } else { + unset env(TZ) + } + } \ + -result {0} + # cleanup namespace delete ::testClock |