Revert "test-futimens: avoid unwarranted test failure on Solaris 5.11"
This reverts commit 0afab138f4aedb7eaab70957c164aa0e5eb01fce.
* m4/futimens.m4 (gl_FUNC_FUTIMENS): Detect the bug.
* tests/test-futimens.h (test_futimens): Enhance, rather than
weaken test.
* doc/posix-functions/futimens.texi (futimens): Document the bug.
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
> > We already worked around this bug for glibc 2.11
> > (thankfully, it has been fixed for current glibc).
> That makes sense. You're welcome to revert this once the .m4
> and wrapper machinery renders it unnecessary.
Done.
ChangeLog | 15 ++++++++-------
doc/posix-functions/futimens.texi | 4 ++++
m4/futimens.m4 | 13 ++++++++-----
tests/test-futimens.h | 3 +++
4 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 60c0d76..5aaee75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-11 Eric Blake <ebl...@redhat.com>
+
+ futimens: work around Solaris 11 bug
+ * m4/futimens.m4 (gl_FUNC_FUTIMENS): Detect the bug.
+ * tests/test-futimens.h (test_futimens): Enhance, rather than
+ weaken test.
+ * doc/posix-functions/futimens.texi (futimens): Document the bug.
+
2010-10-11 Paul Eggert <egg...@cs.ucla.edu>
Indentation.
diff --git a/doc/posix-functions/futimens.texi
b/doc/posix-functions/futimens.texi
index be4698a..7c35b8b 100644
--- a/doc/posix-functions/futimens.texi
+++ b/doc/posix-functions/futimens.texi
@@ -28,6 +28,10 @@ futimens
When using @code{UTIME_OMIT} for the modification time, but specifying
an access time, some systems fail to update the change time:
Linux kernel 2.6.32.
+...@itme
+Passing @code{AT_FDCWD} as the fd argument does not properly fail with
+...@code{ebadf} on some systems:
+glibc 2.11, Solaris 11.
@end itemize
Portability problems not fixed by Gnulib:
diff --git a/m4/futimens.m4 b/m4/futimens.m4
index 255010c..1212fb9 100644
--- a/m4/futimens.m4
+++ b/m4/futimens.m4
@@ -1,4 +1,4 @@
-# serial 4
+# serial 5
# See if we need to provide futimens replacement.
dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
@@ -23,18 +23,21 @@ AC_DEFUN([gl_FUNC_FUTIMENS],
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <errno.h>
]], [[struct timespec ts[2] = { { 1, UTIME_OMIT }, { 1, UTIME_NOW } };
int fd = creat ("conftest.file", 0600);
struct stat st;
if (fd < 0) return 1;
+ errno = 0;
if (futimens (AT_FDCWD, NULL) == 0) return 2;
- if (futimens (fd, ts)) return 3;
+ if (errno != EBADF) return 3;
+ if (futimens (fd, ts)) return 4;
sleep (1);
ts[0].tv_nsec = UTIME_NOW;
ts[1].tv_nsec = UTIME_OMIT;
- if (futimens (fd, ts)) return 4;
- if (fstat (fd, &st)) return 5;
- if (st.st_ctime < st.st_atime) return 6;
+ if (futimens (fd, ts)) return 5;
+ if (fstat (fd, &st)) return 6;
+ if (st.st_ctime < st.st_atime) return 7;
]])],
dnl FIXME: simplify this in 2012, when file system bugs are no longer common
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
diff --git a/tests/test-futimens.h b/tests/test-futimens.h
index a0312b7..3a6d1da 100644
--- a/tests/test-futimens.h
+++ b/tests/test-futimens.h
@@ -75,6 +75,9 @@ test_futimens (int (*func) (int, struct timespec const *),
/* Invalid arguments. */
errno = 0;
+ ASSERT (func (AT_FDCWD, NULL) == -1);
+ ASSERT (errno == EBADF);
+ errno = 0;
ASSERT (func (-1, NULL) == -1);
ASSERT (errno == EBADF);
{
--
1.7.2.3
