From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 18 Sep 2013 20:15:12 +0000 (-0700)
Subject: Support TZ transition times < 00:00:00.
X-Git-Tag: glibc-2.19~257
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=0748546f660d27a2ad29fa6174d456e2f6490758;p=glibc.git

Support TZ transition times < 00:00:00.

This is needed for version-3 tz-format files; it supports time
stamps past 2037 for America/Godthab (the only entry in the tz
database for which this change is relevant).
* manual/time.texi (TZ Variable): Document transition times
from -167:59:59 through -00:00:01.
* time/tzset.c (tz_rule): Time of day is now signed.
(__tzset_parse_tz): Parse negative time of day.
---

diff --git a/ChangeLog b/ChangeLog
index 99588c6a8d..de762a29f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2013-12-17  Paul Eggert  <eggert@cs.ucla.edu>
 
+	Support TZ transition times < 00:00:00.
+	This is needed for version-3 tz-format files; it supports time
+	stamps past 2037 for America/Godthab (the only entry in the tz
+	database for which this change is relevant).
+	* manual/time.texi (TZ Variable): Document transition times
+	from -167:59:59 through -00:00:01.
+	* time/tzset.c (tz_rule): Time of day is now signed.
+	(__tzset_parse_tz): Parse negative time of day.
+
 	Document TZ transition times >= 25:00:00.
 	* manual/time.texi (TZ Variable): Document transition times from
 	25:00:00 through 167:59:59.  These are already supported, and this
diff --git a/NEWS b/NEWS
index 9964445517..7886834864 100644
--- a/NEWS
+++ b/NEWS
@@ -170,6 +170,10 @@ Version 2.18
 * On Linux, the clock function now uses the clock_gettime system call
   for improved precision, rather than old times system call.
 
+* Added support for version-3 tz format files.  This is needed when using
+  the tz database release 2013e or later, and affects a few unusual cases --
+  currently only TZ='America/Godthab' for time stamps after 2037.
+
 * Added new API functions pthread_getattr_default_np and
   pthread_setattr_default_np to get and set the default pthread
   attributes of a process.
diff --git a/manual/time.texi b/manual/time.texi
index c65a73e29f..e7e8647ee2 100644
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -2087,7 +2087,7 @@ between @code{1} and @code{12}.
 The @var{time} fields specify when, in the local time currently in
 effect, the change to the other time occurs.  If omitted, the default is
 @code{02:00:00}.  The hours part of the time fields can range from
-0 through 167; this is an extension to POSIX.1, which allows
+@minus{}167 through 167; this is an extension to POSIX.1, which allows
 only the range 0 through 24.
 
 Here are some example @code{TZ} values, including the appropriate
@@ -2123,6 +2123,16 @@ is a placeholder.
 WART4WARST,J1/0,J365/25
 @end smallexample
 
+Western Greenland Time (WGT) and Western Greenland Summer Time (WGST)
+are 3 hours behind UTC in the winter.  Its clocks follow the European
+Union rules of springing forward by one hour on March's last Sunday at
+01:00 UTC (@minus{}02:00 local time) and falling back on October's
+last Sunday at 01:00 UTC (@minus{}01:00 local time).
+
+@smallexample
+WGT3WGST,M3.5.0/-2,M10.5.0/-1
+@end smallexample
+
 The schedule of Daylight Saving Time in any particular jurisdiction has
 changed over the years.  To be strictly correct, the conversion of dates
 and times in the past should be based on the schedule that was in effect
diff --git a/time/tzset.c b/time/tzset.c
index 4f8af8d523..fb2dccd55d 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -54,7 +54,7 @@ typedef struct
     /* When to change.  */
     enum { J0, J1, M } type;	/* Interpretation of:  */
     unsigned short int m, n, d;	/* Month, week, day.  */
-    unsigned int secs;		/* Time of day.  */
+    int secs;			/* Time of day.  */
 
     long int offset;		/* Seconds east of GMT (west if < 0).  */
 
@@ -362,9 +362,12 @@ __tzset_parse_tz (tz)
       else if (*tz == '/')
 	{
 	  /* Get the time of day of the change.  */
+	  int negative;
 	  ++tz;
 	  if (*tz == '\0')
 	    goto out;
+	  negative = *tz == '-';
+	  tz += negative;
 	  consumed = 0;
 	  switch (sscanf (tz, "%hu%n:%hu%n:%hu%n",
 			  &hh, &consumed, &mm, &consumed, &ss, &consumed))
@@ -379,7 +382,7 @@ __tzset_parse_tz (tz)
 	      break;
 	    }
 	  tz += consumed;
-	  tzr->secs = (hh * 60 * 60) + (mm * 60) + ss;
+	  tzr->secs = (negative ? -1 : 1) * ((hh * 60 * 60) + (mm * 60) + ss);
 	}
       else
 	/* Default to 2:00 AM.  */