diff options
| author | Paul Eggert <eggert@twinsun.com> | 2006-04-04 04:13:02 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@twinsun.com> | 2006-04-04 04:13:02 +0000 |
| commit | d65b42351fbebde2539d447ecf5443e1725bdce3 (patch) | |
| tree | deb0a158f63a41290877cd94550db6d95bd4d500 /lib-src/fakemail.c | |
| parent | d4d0c924b1b4b6d0a20b21b791b0226ba579f5fb (diff) | |
| download | emacs-d65b42351fbebde2539d447ecf5443e1725bdce3.tar.gz | |
* lib-src/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.
* lib-src/fakemail.c: Likewise.
* src/editfns.c (TM_YEAR_IN_ASCTIME_RANGE): New macro, identical to
../lib-src/b2m.c and ../lib-src/editfns.c.
(Fcurrent_time_string): Use it.
Document that the year might not consume 4 columns if it's outside
the range 1000-9999.
Check for asctime failure.
Don't assume that the output string length is always exactly 24.
Diffstat (limited to 'lib-src/fakemail.c')
| -rw-r--r-- | lib-src/fakemail.c | 19 |
1 files changed, 8 insertions, 11 deletions
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'; |