From 74f02f339e113e5a10fd0526985cdb59be92afe7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 22 Apr 1999 21:38:24 +0000 Subject: [PATCH] 1999-04-17 Paul Eggert * autoconf.texi, acspecific.m4 (AC_FUNC_MKTIME): New macro. taken from automake's AM_FUNC_MKTIME. * acfunctions: mktime now belongs to AC_FUNC_MKTIME. --- ChangeLog | 6 ++ acfunctions | 2 +- acspecific.m4 | 162 +++++++++++++++++++++++++++++++++++++++ autoconf.texi | 7 ++ doc/autoconf.texi | 7 ++ lib/autoconf/specific.m4 | 162 +++++++++++++++++++++++++++++++++++++++ lib/autoscan/functions | 2 +- 7 files changed, 346 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e75ed804..b3b07893 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-04-17 Paul Eggert + + * autoconf.texi, acspecific.m4 (AC_FUNC_MKTIME): New macro. + taken from automake's AM_FUNC_MKTIME. + * acfunctions: mktime now belongs to AC_FUNC_MKTIME. + 1999-04-19 Matthew D. Langston * acgeneral.m4 (AC_TRY_LINK_FUNC): Add support for Fortran 77. diff --git a/acfunctions b/acfunctions index 3c04834b..5977cb84 100644 --- a/acfunctions +++ b/acfunctions @@ -20,6 +20,7 @@ signal AC_TYPE_SIGNAL alloca AC_FUNC_ALLOCA fnmatch AC_FUNC_FNMATCH getloadavg AC_FUNC_GETLOADAVG +mktime AC_FUNC_MKTIME mmap AC_FUNC_MMAP setvbuf AC_FUNC_SETVBUF_REVERSED strcoll AC_FUNC_STRCOLL @@ -40,7 +41,6 @@ getcwd AC_CHECK_FUNCS getwd AC_CHECK_FUNCS mkdir AC_CHECK_FUNCS mkfifo AC_CHECK_FUNCS -mktime AC_CHECK_FUNCS putenv AC_CHECK_FUNCS re_comp AC_CHECK_FUNCS regcmp AC_CHECK_FUNCS diff --git a/acspecific.m4 b/acspecific.m4 index d5559fcf..6df45123 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -1642,6 +1642,168 @@ AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS", [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])]) AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])]) +AC_DEFUN(AC_FUNC_MKTIME, +[AC_REQUIRE([AC_HEADER_TIME])dnl +AC_CHECK_HEADERS(sys/time.h unistd.h) +AC_CHECK_FUNCS(alarm) +AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, +[AC_TRY_RUN( +changequote(<<, >>)dnl +< +# include + #else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +#if HAVE_UNISTD_H +# include +#endif + +#if !HAVE_ALARM +# define alarm(X) /* empty */ +#endif + +/* Work around redefinition to rpl_putenv by other config tests. */ +#undef putenv + +static time_t time_t_max; + +/* Values we'll use to set the TZ environment variable. */ +static const char *const tz_strings[] = { + (const char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +}; +#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +/* Fail if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +static void +spring_forward_gap () +{ + /* glibc (up to about 1998-10-07) failed this test) */ + struct tm tm; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + tm.tm_year = 98; + tm.tm_mon = 3; + tm.tm_mday = 5; + tm.tm_hour = 2; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + if (mktime (&tm) == (time_t)-1) + exit (1); +} + +static void +mktime_test (now) + time_t now; +{ + struct tm *lt; + if ((lt = localtime (&now)) && mktime (lt) != now) + exit (1); + now = time_t_max - now; + if ((lt = localtime (&now)) && mktime (lt) != now) + exit (1); +} + +static void +irix_6_4_bug () +{ + /* Based on code from Ariel Faigon. */ + struct tm tm; + tm.tm_year = 96; + tm.tm_mon = 3; + tm.tm_mday = 0; + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); + if (tm.tm_mon != 2 || tm.tm_mday != 31) + exit (1); +} + +static void +bigtime_test (j) + int j; +{ + struct tm tm; + time_t now; + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + now = mktime (&tm); + if (now != (time_t) -1) + { + struct tm *lt = localtime (&now); + if (! (lt + && lt->tm_year == tm.tm_year + && lt->tm_mon == tm.tm_mon + && lt->tm_mday == tm.tm_mday + && lt->tm_hour == tm.tm_hour + && lt->tm_min == tm.tm_min + && lt->tm_sec == tm.tm_sec + && lt->tm_yday == tm.tm_yday + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) + exit (1); + } +} + +int +main () +{ + time_t t, delta; + int i, j; + + /* This test makes some buggy mktime implementations loop. + Give up after 60 seconds; a mktime slower than that + isn't worth using anyway. */ + alarm (60); + + for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) + continue; + time_t_max--; + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { + if (tz_strings[i]) + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta; t += delta) + mktime_test (t); + mktime_test ((time_t) 60 * 60); + mktime_test ((time_t) 60 * 60 * 24); + + for (j = 1; 0 < j; j *= 2) + bigtime_test (j); + bigtime_test (j - 1); + } + irix_6_4_bug (); + spring_forward_gap (); + exit (0); +} +>>, +changequote([, ])dnl +ac_cv_func_working_mktime=yes, ac_cv_func_working_mktime=no, +ac_cv_func_working_mktime=no)]) +if test $ac_cv_func_working_mktime = no; then + LIBOBJS="$LIBOBJS mktime.${ac_objext}" +fi +]) + AC_DEFUN(AC_FUNC_STRFTIME, [AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)], [# strftime is in -lintl on SCO UNIX. diff --git a/autoconf.texi b/autoconf.texi index d94e59e1..5671a290 100644 --- a/autoconf.texi +++ b/autoconf.texi @@ -2053,6 +2053,13 @@ If the @code{memcmp} function is not available, or does not work on variable @code{LIBOBJS}. @end defmac +@defmac AC_FUNC_MKTIME +@maindex FUNC_MKTIME +@ovindex LIBOBJS +If the @code{mktime} function is not available, or does not work +correctly, add @samp{mktime.o} to output variable @code{LIBOBJS}. +@end defmac + @defmac AC_FUNC_MMAP @maindex FUNC_MMAP @cvindex HAVE_MMAP diff --git a/doc/autoconf.texi b/doc/autoconf.texi index d94e59e1..5671a290 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -2053,6 +2053,13 @@ If the @code{memcmp} function is not available, or does not work on variable @code{LIBOBJS}. @end defmac +@defmac AC_FUNC_MKTIME +@maindex FUNC_MKTIME +@ovindex LIBOBJS +If the @code{mktime} function is not available, or does not work +correctly, add @samp{mktime.o} to output variable @code{LIBOBJS}. +@end defmac + @defmac AC_FUNC_MMAP @maindex FUNC_MMAP @cvindex HAVE_MMAP diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index d5559fcf..6df45123 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -1642,6 +1642,168 @@ AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS", [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])]) AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])]) +AC_DEFUN(AC_FUNC_MKTIME, +[AC_REQUIRE([AC_HEADER_TIME])dnl +AC_CHECK_HEADERS(sys/time.h unistd.h) +AC_CHECK_FUNCS(alarm) +AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, +[AC_TRY_RUN( +changequote(<<, >>)dnl +< +# include + #else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif + +#if HAVE_UNISTD_H +# include +#endif + +#if !HAVE_ALARM +# define alarm(X) /* empty */ +#endif + +/* Work around redefinition to rpl_putenv by other config tests. */ +#undef putenv + +static time_t time_t_max; + +/* Values we'll use to set the TZ environment variable. */ +static const char *const tz_strings[] = { + (const char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +}; +#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +/* Fail if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +static void +spring_forward_gap () +{ + /* glibc (up to about 1998-10-07) failed this test) */ + struct tm tm; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + tm.tm_year = 98; + tm.tm_mon = 3; + tm.tm_mday = 5; + tm.tm_hour = 2; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + if (mktime (&tm) == (time_t)-1) + exit (1); +} + +static void +mktime_test (now) + time_t now; +{ + struct tm *lt; + if ((lt = localtime (&now)) && mktime (lt) != now) + exit (1); + now = time_t_max - now; + if ((lt = localtime (&now)) && mktime (lt) != now) + exit (1); +} + +static void +irix_6_4_bug () +{ + /* Based on code from Ariel Faigon. */ + struct tm tm; + tm.tm_year = 96; + tm.tm_mon = 3; + tm.tm_mday = 0; + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); + if (tm.tm_mon != 2 || tm.tm_mday != 31) + exit (1); +} + +static void +bigtime_test (j) + int j; +{ + struct tm tm; + time_t now; + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + now = mktime (&tm); + if (now != (time_t) -1) + { + struct tm *lt = localtime (&now); + if (! (lt + && lt->tm_year == tm.tm_year + && lt->tm_mon == tm.tm_mon + && lt->tm_mday == tm.tm_mday + && lt->tm_hour == tm.tm_hour + && lt->tm_min == tm.tm_min + && lt->tm_sec == tm.tm_sec + && lt->tm_yday == tm.tm_yday + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) + exit (1); + } +} + +int +main () +{ + time_t t, delta; + int i, j; + + /* This test makes some buggy mktime implementations loop. + Give up after 60 seconds; a mktime slower than that + isn't worth using anyway. */ + alarm (60); + + for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) + continue; + time_t_max--; + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { + if (tz_strings[i]) + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta; t += delta) + mktime_test (t); + mktime_test ((time_t) 60 * 60); + mktime_test ((time_t) 60 * 60 * 24); + + for (j = 1; 0 < j; j *= 2) + bigtime_test (j); + bigtime_test (j - 1); + } + irix_6_4_bug (); + spring_forward_gap (); + exit (0); +} +>>, +changequote([, ])dnl +ac_cv_func_working_mktime=yes, ac_cv_func_working_mktime=no, +ac_cv_func_working_mktime=no)]) +if test $ac_cv_func_working_mktime = no; then + LIBOBJS="$LIBOBJS mktime.${ac_objext}" +fi +]) + AC_DEFUN(AC_FUNC_STRFTIME, [AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)], [# strftime is in -lintl on SCO UNIX. diff --git a/lib/autoscan/functions b/lib/autoscan/functions index 3c04834b..5977cb84 100644 --- a/lib/autoscan/functions +++ b/lib/autoscan/functions @@ -20,6 +20,7 @@ signal AC_TYPE_SIGNAL alloca AC_FUNC_ALLOCA fnmatch AC_FUNC_FNMATCH getloadavg AC_FUNC_GETLOADAVG +mktime AC_FUNC_MKTIME mmap AC_FUNC_MMAP setvbuf AC_FUNC_SETVBUF_REVERSED strcoll AC_FUNC_STRCOLL @@ -40,7 +41,6 @@ getcwd AC_CHECK_FUNCS getwd AC_CHECK_FUNCS mkdir AC_CHECK_FUNCS mkfifo AC_CHECK_FUNCS -mktime AC_CHECK_FUNCS putenv AC_CHECK_FUNCS re_comp AC_CHECK_FUNCS regcmp AC_CHECK_FUNCS