From ce5669aa12199346763b2468d389893d1411af40 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 30 Oct 2005 21:30:15 +0000 Subject: [PATCH] * lib/utimens.c (futimens) [HAVE_WORKING_UTIMES && HAVE_FUTIMES]: Don't assume that futimes failing means we mustfail. --- lib/ChangeLog | 6 ++++++ lib/utimens.c | 20 +++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index 87bf2c246a..bb1edf84fc 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,9 @@ +2005-10-30 Paul Eggert + + Fix porting problem reported by Theodoros V. Kalamatianos. + * utimens.c (futimens) [HAVE_WORKING_UTIMES && HAVE_FUTIMES]: + Don't assume that futimes failing means we mustfail. + 2005-10-29 Paul Eggert * getcwd.c (__getcwd): Don't assume that system calls after readdir diff --git a/lib/utimens.c b/lib/utimens.c index 7f88f2fa96..8d8bef468e 100644 --- a/lib/utimens.c +++ b/lib/utimens.c @@ -99,17 +99,15 @@ futimens (int fd ATTRIBUTE_UNUSED, if (futimes (fd, t) == 0) return 0; - /* On GNU/Linux without the futimes syscall and without /proc - mounted, glibc futimes fails with errno == ENOENT. Fall back - on utimes if we get a weird error number like that. */ - switch (errno) - { - case EACCES: - case EIO: - case EPERM: - case EROFS: - return -1; - } + /* Don't worry about trying to speed things up by returning right + away here. glibc futimes can incorrectly fail with errno == + ENOENT if /proc isn't mounted. Also, Mandrake 10.0 in high + security mode doesn't allow ordinary users to read /proc/self, so + glibc futimes incorrectly fails with errno == EACCES. If futimes + fails with errno == EIO, EPERM, or EROFS, it's probably safe to + fail right away, but these cases are rare enough that they're not + worth optimizing, and who knows what other messed-up systems are + out there? So play it safe and fall back on the code below. */ } # endif #endif -- 2.30.2