changeset 208:bbe47cd94702

merge with 1.9.4f
author Jim Meyering <jim@meyering.net>
date Mon, 25 Apr 1994 16:34:49 +0000
parents 25a5ae7fce09
children f6c94599f020
files lib/getdate.y
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -904,8 +904,14 @@
 
 	if (! (tm = gmtime (&ftz.time)))
 	    return -1;
-	gmt = *tm;	/* Make a copy, in case localtime modifies *tm.  */
-	ftz.timezone = difftm (&gmt, localtime (&ftz.time)) / 60;
+	gmt = *tm;
+
+	if (! (tm = localtime (&ftz.time)))
+	    return -1;
+	
+	ftz.timezone = difftm (&gmt, tm) / 60;
+	if(tm->tm_isdst)
+	    ftz.timezone += 60;
     }
 
     tm = localtime(&now->time);