AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-26 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

linux: Consolidate utimes

Browse Source 
The generic version does not have time64 support and Linux default
uses utimensat.  With hppa version gone, __ASSUME_UTIMES is not used
anymore.

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Adhemerval Zanella 2020-07-09 16:35:28 -03:00
parent 7c7671767e
commit 4af88f96de
3 changed files with 0 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sysdeps/unix/sysv/linux/generic/utimes.c
View File

@ -1,46 +0,0 @@
/* utimes -- Change access and modification times of file. Linux version.
Copyright (C) 2011-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
<https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <stddef.h>
#include <utime.h>
#include <fcntl.h>
#include <sys/time.h>
#include <sysdep.h>
/* Change the access time of FILE to TVP[0] and
the modification time of FILE to TVP[1]. */
int
__utimes (const char *file, const struct timeval tvp[2])
{
struct timespec ts[2];
struct timespec *tsp = NULL;
if (tvp)
{
TIMEVAL_TO_TIMESPEC (&tvp[0], &ts[0]);
TIMEVAL_TO_TIMESPEC (&tvp[1], &ts[1]);
tsp = &ts[0];
}
return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tsp, 0);
}
weak_alias (__utimes, utimes)

5
sysdeps/unix/sysv/linux/hppa/kernel-features.h
View File

@ -18,11 +18,6 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
/* Support for the utimes syscall was added in 3.14. */
#if __LINUX_KERNEL_VERSION >= 0x030e00
# define __ASSUME_UTIMES 1
#endif
#include_next <kernel-features.h> #include_next <kernel-features.h>
#define __ASSUME_RECV_SYSCALL 1 #define __ASSUME_RECV_SYSCALL 1

30
sysdeps/unix/sysv/linux/hppa/utimes.c
View File

@ -1,30 +0,0 @@
/* Implement utimes for hppa.
Copyright (C) 2014-2020 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
/* hppa has the utimensat syscall in all supported kernel versions but
gained the utimes syscall later, so use the linux-generic
implementation of utimes in terms of the utimensat syscall unless
the utimes syscall is known to be available. */
#include <kernel-features.h>
#ifdef __ASSUME_UTIMES
# include <sysdeps/unix/sysv/linux/utimes.c>
#else
# include <sysdeps/unix/sysv/linux/generic/utimes.c>
#endif