From 5cebc517751c48c46022b2ee529659307a94d628 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Sun, 14 Dec 2003 23:51:30 +0000
Subject: Fix some dst issues in _time_mktime().   Normalize the tm_isdst value
 to -1, 0, or 1.   If no dst for this timezone, then reset tm_isdst to 0.

---
 libc/misc/time/time.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'libc')

diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 69e688b40..be3216423 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -128,6 +128,10 @@
  *   Fix a dst-related bug which resulted in use of uninitialized data.
  *
  * Nov 15, 2003 I forgot to update the thread locking in the last dst fix.
+ *
+ * Dec 14, 2003 Fix some dst issues in _time_mktime().
+ *   Normalize the tm_isdst value to -1, 0, or 1.
+ *   If no dst for this timezone, then reset tm_isdst to 0.
  */
 
 #define _GNU_SOURCE
@@ -2108,11 +2112,14 @@ time_t _time_mktime(struct tm *timeptr, int store_on_success)
 
 	memcpy(p, timeptr, sizeof(struct tm));
 
-	if ((default_dst = p[8]) < 0) {	/* Try to determing if dst? */
-		default_dst = 1;		/* Assume advancing. */
-		if (!_time_tzinfo[1].tzname[0]) { /* Oops... no dst. */
-			default_dst = p[8] = 0;
-		}
+	if (!_time_tzinfo[1].tzname[0]) { /* No dst in this timezone, */
+		p[8] = 0;				/* so set tm_isdst to 0. */
+	}
+
+	default_dst = 0;
+	if (p[8]) {					/* Either dst or unknown? */
+		default_dst = 1;		/* Assume advancing (even if unknown). */
+		p[8] = ((p[8] > 0) ? 1 : -1); /* Normalize so abs() <= 1. */
 	}
 
 	d = 400;
-- 
cgit v1.2.3