Changeset 238

Timestamp:

Jul 15, 2009, 8:08:00 PM (15 years ago)

Author:

katerina

Message:

Fix timezone format in email date header (ticket #158).

Location:

trunk

Files:

• aclocal.m4 (modified) (1 diff)
• configure.ac (modified) (1 diff)
• docs/Changelog (modified) (1 diff)
• src/sh_mail.c (modified) (1 diff)

trunk/aclocal.m4

@@ -2064 +2064 @@
 ])# AC_PROG_LD_GNU
 
+# SH_STRFTIME_Z
+# -------------
+# check whether strftime supports %z
+AC_DEFUN([SH_STRFTIME_Z],
+[
+AC_MSG_CHECKING([whether strftime supports %z])
+AC_TRY_RUN([
+#include <time.h>
+#include <string.h>
+int main()
+{
+   struct tm tm;
+   char tt[64];
+   memset(&tm, 0, sizeof(tm));
+   strftime(tt, sizeof(tt), "%z", &tm);
+
+   if (strlen(tt) != 5) return 1;
+   return 0;
+}
+],
+[
+AC_MSG_RESULT([yes])
+AC_DEFINE(HAVE_STRFTIME_Z, 1, [strftime supports %z])
+],
+[
+AC_MSG_RESULT([no])
+],[
+AC_MSG_RESULT([no])
+])])
+
+
+
+
+
 dnl *-*wedit:notab*-*  Please keep this as the last line.
 

trunk/configure.ac

@@ -376 +376 @@
 AC_CHECK_FUNCS(vsnprintf, [SL_CHECK_VSNPRINTF])
 AC_CHECK_MLOCK
+SH_STRFTIME_Z
 
 AC_MSG_CHECKING(how to get filesystem type)

trunk/docs/Changelog

@@ -1 +1 @@
 2.5.7:
+        * If available, use %z to print timezone as hour offset from GMT
+          in email date headers (problem reported by NP, solution suggested
+          by TimB).
         * eliminate C99-style comments (problem reported by
           venkat)

trunk/src/sh_mail.c

@@ -1264 +1264 @@
   my_tm   = localtime(&my_time);
 #endif
+
+#if defined(HAVE_STRFTIME_Z)
+  (void)    strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %z"), my_tm);
+#else
   (void)    strftime(my_tbuf, 127, _("%a, %d %b %Y %H:%M:%S %Z"), my_tm);
+#endif
 
   TPT(( 0, FIL__, __LINE__,  _("msg=<From: <%s>%c%cTo: <%s>%c%cDate: %s>%c%c"),