diff options
author | Paul Eggert <[email protected]> | 2006-04-04 04:13:02 +0000 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2006-04-04 04:13:02 +0000 |
commit | d65b42351fbebde2539d447ecf5443e1725bdce3 (patch) | |
tree | deb0a158f63a41290877cd94550db6d95bd4d500 /src | |
parent | d4d0c924b1b4b6d0a20b21b791b0226ba579f5fb (diff) |
* 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 'src')
-rw-r--r-- | src/ChangeLog | 10 | ||||
-rw-r--r-- | src/editfns.c | 34 |
2 files changed, 27 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 88a8b7b4df..669c5a0c0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2006-04-03 Paul Eggert <[email protected]> + + * 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. + 2006-04-03 YAMAMOTO Mitsuharu <[email protected]> * macterm.c (XTread_socket): Initialize variable `f' before its use. diff --git a/src/editfns.c b/src/editfns.c index 888bbe3062..450a768458 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -74,6 +74,13 @@ extern char **environ; #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) \ + (1000 - TM_YEAR_BASE <= (tm_year) && (tm_year) <= 9999 - TM_YEAR_BASE) +#endif + extern size_t emacs_strftimeu P_ ((char *, size_t, const char *, const struct tm *, int)); static int tm_diff P_ ((struct tm *, struct tm *)); @@ -1833,7 +1840,8 @@ usage: (encode-time SECOND MINUTE HOUR DAY MONTH YEAR &optional ZONE) */) DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0, doc: /* Return the current time, as a human-readable string. Programs can use this function to decode a time, -since the number of columns in each field is fixed. +since the number of columns in each field is fixed +if the year is in the range 1000-9999. The format is `Sun Sep 16 01:03:52 1973'. However, see also the functions `decode-time' and `format-time-string' which provide a much more powerful and general facility. @@ -1847,31 +1855,23 @@ but this is considered obsolete. */) Lisp_Object specified_time; { time_t value; - char buf[30]; struct tm *tm; register char *tem; if (! lisp_time_argument (specified_time, &value, NULL)) error ("Invalid time specification"); - /* Do not use ctime, since it has undefined behavior with - out-of-range time stamps. This avoids a core dump triggered by - (current-time-string '(2814749767106 0)) on 64-bit Solaris 8. See - <http://www.opengroup.org/austin/mailarchives/ag/msg09294.html> - for more details about this portability problem. */ + + /* Convert to a string, checking for out-of-range time stamps. + Don't use 'ctime', as that might dump core if VALUE is out of + range. */ tm = localtime (&value); - /* Checking for out-of-range time stamps avoids buffer overruns that - cause core dump on some systems (e.g., 64-bit Solaris), and also - preserves the historic behavior of always returning a fixed-size - 24-character string. */ - if (! (tm && -999 - TM_YEAR_BASE <= tm->tm_year - && tm->tm_year <= 9999 - TM_YEAR_BASE)) + if (! (tm && TM_YEAR_IN_ASCTIME_RANGE (tm->tm_year) && (tem = asctime (tm)))) error ("Specified time is not representable"); - tem = asctime (tm); - strncpy (buf, tem, 24); - buf[24] = 0; + /* Remove the trailing newline. */ + tem[strlen (tem) - 1] = '\0'; - return build_string (buf); + return build_string (tem); } /* Yield A - B, measured in seconds. |