Fix crashes with 64bit time_t. Closes #3184.

diff --git a/ChangeLog b/ChangeLog
index fca1162f6da6ecc4301905fb78d3036fed869f89..1d89f17564784c4092114759a73c710cbc7aea67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-09 12:04 +0100  Vincent Lefevre  <vincent@vinc17.org>  (4ce562b7f5d7)
+
+       * mbyte.h: Unbreak compilation on OS X with --with-regex/--without-wc-
+       funcs. Closes #3149.
+
+2009-03-09 11:58 +0100  Rocco Rutte  <pdmef@gmx.net>  (f3a33b77dc90)
+
+       * ChangeLog, mutt.h, regex.c: Unbreak compilation with --without-wc-
+       funcs on OS X 10.5.*, see #3149.
+
 2009-03-09 11:49 +0100  Rocco Rutte  <pdmef@gmx.net>  (bcf1e9692caf)
 
        * init.h: Fix 11cd72da743a

diff --git a/mh.c b/mh.c
index 53df87565cc31373308ad2d474acb84eb5115f1b..e795a02f762478688920cc9b03d2480c0c1cbd03 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -1242,8 +1242,8 @@ int maildir_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
   omask = umask (mh_umask (dest));
   FOREVER
   {
-    snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%ld.%u_%d.%s%s",
-             dest->path, subdir, time (NULL), (unsigned int)getpid (),
+    snprintf (path, _POSIX_PATH_MAX, "%s/tmp/%s.%lld.%u_%d.%s%s",
+             dest->path, subdir, (long long)time (NULL), (unsigned int)getpid (),
              Counter++, NONULL (Hostname), suffix);
 
     dprint (2, (debugfile, "maildir_open_new_message (): Trying %s.\n",
@@ -1328,8 +1328,8 @@ int maildir_commit_message (CONTEXT * ctx, MESSAGE * msg, HEADER * hdr)
   /* construct a new file name. */
   FOREVER
   {
-    snprintf (path, _POSIX_PATH_MAX, "%s/%ld.%u_%d.%s%s", subdir,
-             time (NULL), (unsigned int)getpid (), Counter++, 
+    snprintf (path, _POSIX_PATH_MAX, "%s/%lld.%u_%d.%s%s", subdir,
+             (long long)time (NULL), (unsigned int)getpid (), Counter++,
              NONULL (Hostname), suffix);
     snprintf (full, _POSIX_PATH_MAX, "%s/%s", ctx->path, path);