X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmktime.m4;h=07be5ccc0e2b39a337ba0c0682ad864ef0d768d6;hb=cd16db1c8303d85166d2d27e51bd6b1614380926;hp=fef22225626aea3ded8442de4dac1e44c5d27d85;hpb=3b078cb57dc8592b174e6eb3ffee1072ea7227f1;p=gnulib.git diff --git a/m4/mktime.m4 b/m4/mktime.m4 index fef222256..07be5ccc0 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,20 +1,24 @@ -#serial 103 -dnl FIXME: when this goes back into automake, reset this to a small number +#serial 7 +dnl Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. dnl From Jim Meyering. -dnl FIXME: this should migrate into libit. -dnl FIXME: when this goes back into automake, remove all jm_ prefixes - -AC_DEFUN(jm_AM_FUNC_MKTIME, +# Redefine AC_FUNC_MKTIME, to fix a bug in Autoconf 2.57 and earlier. +# This redefinition can be removed once a new version of Autoconf comes out. +# The redefinition is taken from +# . +# AC_FUNC_MKTIME +# -------------- +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], jm_am_cv_func_working_mktime, - [AC_TRY_RUN( -changequote(<<, >>)dnl -< # include @@ -26,9 +30,8 @@ changequote(<<, >>)dnl # endif #endif -#if HAVE_UNISTD_H -# include -#endif +#include +#include #if !HAVE_ALARM # define alarm(X) /* empty */ @@ -38,24 +41,56 @@ changequote(<<, >>)dnl #undef putenv static time_t time_t_max; +static time_t time_t_min; /* Values we'll use to set the TZ environment variable. */ -static const char *const tz_strings[] = { - (const char *) 0, "GMT0", "JST-9", - "EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +static char *tz_strings[] = { + (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 -mktime_test (now) +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_test1 (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 +mktime_test (now) + time_t now; +{ + mktime_test1 (now); + mktime_test1 ((time_t) (time_t_max - now)); + mktime_test1 ((time_t) (time_t_min + now)); } static void @@ -82,11 +117,7 @@ bigtime_test (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; - /* This test makes some buggy mktime implementations loop. - Give up after 10 seconds. */ - alarm (10); now = mktime (&tm); - alarm (0); if (now != (time_t) -1) { struct tm *lt = localtime (&now); @@ -111,9 +142,17 @@ 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--; + if ((time_t) -1 < 0) + for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) + continue; delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) { @@ -122,23 +161,35 @@ main () 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); + mktime_test ((time_t) 1); + 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); bigtime_test (j - 1); } irix_6_4_bug (); + spring_forward_gap (); exit (0); -} - >>, -changequote([, ])dnl - jm_am_cv_func_working_mktime=yes, jm_am_cv_func_working_mktime=no, - dnl When crosscompiling, assume mktime is missing or broken. - jm_am_cv_func_working_mktime=no) - ]) - if test $jm_am_cv_func_working_mktime = no; then - LIBOBJS="$LIBOBJS mktime.o" +}]])], + [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 + AC_LIBOBJ([mktime]) +fi +])# AC_FUNC_MKTIME + +AC_DEFUN([gl_FUNC_MKTIME], +[ + AC_REQUIRE([AC_FUNC_MKTIME]) + if test $ac_cv_func_working_mktime = no; then + AC_DEFINE(mktime, rpl_mktime, + [Define to rpl_mktime if the replacement function should be used.]) + gl_PREREQ_MKTIME fi ]) + +# Prerequisites of lib/mktime.c. +AC_DEFUN([gl_PREREQ_MKTIME], [:])