23270: fix strptime() on Solaris

2 files changed, 17 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d7dfad425..34ca8005a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-12  Peter Stephenson  <pws@csr.com>
+
+	* 23270: Src/system.h: #define _STRPTIME_DONTZERO to get Solaris
+	strptime() to work properly.
+
 2007-04-05  Clint Adams  <clint@zsh.org>
 
 	* 23264: Src/Modules/pcre.c: don't add the -pcre-match
diff --git a/Src/system.h b/Src/system.h
index 2f3dcd32a..fafa5dd01 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -52,6 +52,18 @@
 # undef HAVE_SYS_UTSNAME_H
 #endif
 
+/*
+ * Solaris by default zeroes all elements of the tm structure in
+ * strptime().  Unfortunately that gives us no way of telling whether
+ * the tm_isdst element has been set from the input pattern.  If it
+ * hasn't we want it to be -1 (undetermined) on input to mktime().  So
+ * we stop strptime() zeroing the struct tm and instead set all the
+ * elements ourselves.
+ *
+ * This is likely to be harmless everywhere else.
+ */
+#define _STRPTIME_DONTZERO
+
 #ifdef PROTOTYPES
 # define _(Args) Args
 #else