Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-54

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 190-203)

   - Update from CVS
   - Undo incorrect merge of etc/images/README from Gnus 5.10
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 74-80)

   - Update from CVS
   - Update from CVS: README: Addition from 5.10.6 tar ball.

3 files changed, 26 insertions, 22 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 72ff56c2dfd..a38c0cb6770 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* b2m.c (main): Don't include <limits.h>.
+	(TM_YEAR_BASE): New macro.
+	(TM_YEAR_IN_ASCTIME_RANGE): Don't define if already defined, so
+	that s/ files can override this.  Use the more-conservative range
+	1000-9999.
+	(main): Check for asctime returning NULL.
+	* fakemail.c: Likewise.
+
 2006-03-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* b2m.c: Include <limits.h>.
diff --git a/lib-src/b2m.c b/lib-src/b2m.c
index adaa736bcd9..a3ab9a5bb9a 100644
--- a/lib-src/b2m.c
+++ b/lib-src/b2m.c
@@ -26,7 +26,6 @@
 #undef static
 #endif
 
-#include <limits.h>
 #include <stdio.h>
 #include <time.h>
 #include <sys/types.h>
@@ -45,15 +44,13 @@
 
 typedef int logical;
 
-/* True if TM_YEAR is a struct tm's tm_year value that is acceptable
-   to asctime.  Glibc asctime returns a useful string unless TM_YEAR
-   is nearly INT_MAX, but the C Standard lets C libraries overrun a
-   buffer if TM_YEAR needs more than 4 bytes.  */
-#ifdef __GLIBC__
-# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) ((tm_year) <= INT_MAX - 1900)
-#else
+#define TM_YEAR_BASE 1900
+
+/* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
+   asctime to have well-defined behavior.  */
+#ifndef TM_YEAR_IN_ASCTIME_RANGE
 # define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
-    (-999 - 1900 <= (tm_year) && (tm_year) <= 9999 - 1900)
+    (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
 #endif
 
 /*
@@ -148,9 +145,9 @@ main (argc, argv)
      Don't use 'ctime', as that might dump core if the hardware clock
      is set to a bizarre value.  */
   tm = localtime (&ltoday);
-  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)))
+  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
+	 && (today = asctime (tm))))
     fatal ("current time is out of range");
-  today = asctime (tm);
   data.size = 200;
   data.buffer = xnew (200, char);
 
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index 2c2b462e366..6b8634f34ab 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -53,7 +53,6 @@ main ()
 #include "ntlib.h"
 #endif
 
-#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -71,15 +70,13 @@ main ()
 #define true 1
 #define false 0
 
-/* True if TM_YEAR is a struct tm's tm_year value that is acceptable
-   to asctime.  Glibc asctime returns a useful string unless TM_YEAR
-   is nearly INT_MAX, but the C Standard lets C libraries overrun a
-   buffer if TM_YEAR needs more than 4 bytes.  */
-#ifdef __GLIBC__
-# define TM_YEAR_IN_ASCTIME_RANGE(tm_year) ((tm_year) <= INT_MAX - 1900)
-#else
+#define TM_YEAR_BASE 1900
+
+/* Nonzero if TM_YEAR is a struct tm's tm_year value that causes
+   asctime to have well-defined behavior.  */
+#ifndef TM_YEAR_IN_ASCTIME_RANGE
 # define TM_YEAR_IN_ASCTIME_RANGE(tm_year) \
-    (-999 - 1900 <= (tm_year) && (tm_year) <= 9999 - 1900)
+    (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE)
 #endif
 
 /* Various lists */
@@ -378,9 +375,9 @@ make_file_preface ()
      Don't use 'ctime', as that might dump core if the hardware clock
      is set to a bizarre value.  */
   tm = localtime (&idiotic_interface);
-  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)))
+  if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year)
+	 && (the_date = asctime (tm))))
     fatal ("current time is out of range", 0);
-  the_date = asctime (tm);
   /* the_date has an unwanted newline at the end */
   date_length = strlen (the_date) - 1;
   the_date[date_length] = '\0';