diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/futimes.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/futimes.c | 63 |
1 files changed, 50 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/futimes.c b/sysdeps/unix/sysv/linux/futimes.c index b307c3ff64..610f1deb29 100644 --- a/sysdeps/unix/sysv/linux/futimes.c +++ b/sysdeps/unix/sysv/linux/futimes.c @@ -20,6 +20,7 @@ #include <errno.h> #include <sysdep.h> #include <string.h> +#include <time.h> #include <utime.h> #include <sys/time.h> #include <stdio-common/_itoa.h> @@ -27,32 +28,67 @@ #include <kernel-features.h> -/* Change the access time of FILE to TVP[0] and - the modification time of FILE to TVP[1], but do not follow symlinks. - The Linux kernel has no futimes() syscall so we use the /proc - filesystem. */ +#ifndef __ASSUME_UTIMENSAT +static int miss_utimensat; +#endif + +/* Change the access time of the file associated with FD to TVP[0] and + the modification time of FILE to TVP[1]. + + Starting with 2.6.22 the Linux kernel has the utimensat syscall which + can be used to implement futimes. Earlier kernels have no futimes() + syscall so we use the /proc filesystem. */ int __futimes (int fd, const struct timeval tvp[2]) { + /* The utimensat system call expects timespec not timeval. */ + struct timespec ts[2]; + if (tvp != NULL) + { + if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000 + || tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000) + { + __set_errno (EINVAL); + return -1; + } + + TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]); + TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]); + } + +#ifdef __ASSUME_UTIMENSAT + return INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0); +#else + int result; +# ifdef __NR_utimensat + if (!__builtin_expect (miss_utimensat, 0)) + { + result = INLINE_SYSCALL (utimensat, 4, fd, NULL, tvp ? &ts : NULL, 0); + if (__builtin_expect (result, 0) != -1 || errno != ENOSYS) + return result; + + miss_utimensat = 1; + } +# endif + static const char selffd[] = "/proc/self/fd/"; char fname[sizeof (selffd) + 3 * sizeof (int)]; fname[sizeof (fname) - 1] = '\0'; char *cp = _itoa_word ((unsigned int) fd, fname + sizeof (fname) - 1, 10, 0); cp = memcpy (cp - sizeof (selffd) + 1, selffd, sizeof (selffd) - 1); - int result; -#ifdef __NR_utimes +# ifdef __NR_utimes result = INLINE_SYSCALL (utimes, 2, cp, tvp); -# ifndef __ASSUME_UTIMES +# ifndef __ASSUME_UTIMES if (result == -1 && errno == ENOSYS) +# endif # endif -#endif { /* The utimes() syscall does not exist or is not available in the used kernel. Use utime(). For this we have to convert to the data format utime() expects. */ -#ifndef __ASSUME_UTIMES +# ifndef __ASSUME_UTIMES struct utimbuf buf; struct utimbuf *times; @@ -66,7 +102,7 @@ __futimes (int fd, const struct timeval tvp[2]) times = NULL; result = INLINE_SYSCALL (utime, 2, cp, times); -#endif +# endif } if (result == -1) @@ -88,14 +124,15 @@ __futimes (int fd, const struct timeval tvp[2]) case ENOENT: /* Validate the file descriptor by letting fcntl set errno to EBADF if it's bogus. Otherwise it's a /proc issue. */ -#if !defined __NR_fcntl && defined __NR_fcntl64 -# define __NR_fcntl __NR_fcntl64 -#endif +# if !defined __NR_fcntl && defined __NR_fcntl64 +# define __NR_fcntl __NR_fcntl64 +# endif if (INLINE_SYSCALL (fcntl, 3, fd, F_GETFD, 0) != -1) __set_errno (ENOSYS); break; } return result; +#endif } weak_alias (__futimes, futimes) |