From 48bde603f0ddf53ffad933b5fd4229bae039206e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 18 Jan 2005 23:52:18 +0000 Subject: [PATCH] Work around tests/touch/empty-file failure on a system (sparc64, Linux-2.4.28, glibc-2.3.3) that didn't honor utimes' NULL-means-set-to-current-time semantics. Remove temporary file immediately, rather than waiting for configure's at-exit trap code to do it. --- m4/utimes.m4 | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/m4/utimes.m4 b/m4/utimes.m4 index dae46f00eb..ba74b3f6e3 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,8 +1,17 @@ +# Detect some bugs in glibc's implementation of utimes. + +dnl Copyright (C) 2003, 2004, 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. + # See if we need to work around bugs in glibc's implementation of # utimes from 2003-07-12 to 2003-09-17. # First, there was a bug that would make utimes set mtime # and atime to zero (1970-01-01) unconditionally. # Then, there was code to round rather than truncate. +# Then, there was an implementation (sparc64, Linux-2.4.28, glibc-2.3.3) +# that didn't honor the NULL-means-set-to-current-time semantics. # # From Jim Meyering, with suggestions from Paul Eggert. @@ -15,6 +24,7 @@ AC_DEFUN([gl_FUNC_UTIMES], #include #include #include +#include #include #include #include @@ -27,13 +37,29 @@ main () struct stat sbuf; char const *file = "conftest.utimes"; FILE *f; + time_t now; - exit ( ! ((f = fopen (file, "w")) + int ok = ((f = fopen (file, "w")) && fclose (f) == 0 && utimes (file, timeval) == 0 && lstat (file, &sbuf) == 0 && sbuf.st_atime == timeval[0].tv_sec - && sbuf.st_mtime == timeval[1].tv_sec) ); + && sbuf.st_mtime == timeval[1].tv_sec); + unlink (file); + if (!ok) + exit (1); + + ok = + ((f = fopen (file, "w")) + && fclose (f) == 0 + && time (&now) != (time_t)-1 + && utimes (file, NULL) == 0 + && lstat (file, &sbuf) == 0 + && now - sbuf.st_atime <= 2 + && now - sbuf.st_mtime <= 2); + unlink (file); + + exit (!ok); } ]])], [gl_cv_func_working_utimes=yes], -- 2.30.2