mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-23 17:53:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

y2038: linux: Provide __lutimes64 implementation

Browse Source 
This conversion patch for supporting 64 bit time for lutimes mostly differs from
the work performed for futimes (when providing __futimes64) with adding the
AT_SYMLINK_NOFOLLOW flag to utimensat.
It also supports passing file name instead of file descriptor number, but this
is not relevant for utimensat used to implement it.

All the design and conversion decisions are exactly the same as for futimens
conversion.
This commit is contained in:
Lukasz Majewski 2020-02-16 23:02:05 +01:00
parent f072671cf5
commit 1a5e12826c
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/time.h
View File

@ -207,10 +207,13 @@ libc_hidden_proto (__utimensat64_helper);
#if __TIMESIZE == 64
# define __futimes64 __futimes
# define __lutimes64 __lutimes
# define __futimens64 __futimens
#else
extern int __futimes64 (int fd, const struct __timeval64 tvp64[2]);
libc_hidden_proto (__futimes64);
extern int __lutimes64 (const char *file, const struct __timeval64 tvp64[2]);
libc_hidden_proto (__lutimes64);
extern int __futimens64 (int fd, const struct __timespec64 tsp[2]);
libc_hidden_proto (__futimens64);
#endif

41
sysdeps/unix/sysv/linux/lutimes.c
View File

@ -20,25 +20,36 @@
#include <errno.h>
#include <fcntl.h>
#include <time.h>
#include <sys/time.h>
#include <sysdep.h>
int
lutimes (const char *file, const struct timeval tvp[2])
__lutimes64 (const char *file, const struct __timeval64 tvp64[2])
{
/* The system call espects timespec, not timeval. */
struct timespec ts[2];
if (tvp != NULL)
struct __timespec64 ts64[2];
if (tvp64 != NULL)
{
if (tvp[0].tv_usec < 0 || tvp[0].tv_usec >= 1000000
|| tvp[1].tv_usec < 0 || tvp[1].tv_usec >= 1000000)
return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]);
TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]);
ts64[0] = timeval64_to_timespec64 (tvp64[0]);
ts64[1] = timeval64_to_timespec64 (tvp64[1]);
}
return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tvp ? ts : NULL,
AT_SYMLINK_NOFOLLOW);
return __utimensat64_helper (AT_FDCWD, file, tvp64 ? &ts64[0] : NULL,
AT_SYMLINK_NOFOLLOW);
}
#if __TIMESIZE != 64
libc_hidden_def (__lutimes64)
int
__lutimes (const char *file, const struct timeval tvp[2])
{
struct __timeval64 tv64[2];
if (tvp != NULL)
{
tv64[0] = valid_timeval_to_timeval64 (tvp[0]);
tv64[1] = valid_timeval_to_timeval64 (tvp[1]);
}
return __lutimes64 (file, tvp ? &tv64[0] : NULL);
}
#endif
weak_alias (__lutimes, lutimes)