From patchwork Wed Apr 18 20:17:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26819 Received: (qmail 120000 invoked by alias); 18 Apr 2018 20:21:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 119915 invoked by uid 89); 18 Apr 2018 20:21:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 40/63] Y2038: add function __utimes64 Date: Wed, 18 Apr 2018 22:17:56 +0200 Message-Id: <20180418201819.15952-41-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-40-albert.aribaud@3adev.fr> References: <20180418201819.15952-1-albert.aribaud@3adev.fr> <20180418201819.15952-2-albert.aribaud@3adev.fr> <20180418201819.15952-3-albert.aribaud@3adev.fr> <20180418201819.15952-4-albert.aribaud@3adev.fr> <20180418201819.15952-5-albert.aribaud@3adev.fr> <20180418201819.15952-6-albert.aribaud@3adev.fr> <20180418201819.15952-7-albert.aribaud@3adev.fr> <20180418201819.15952-8-albert.aribaud@3adev.fr> <20180418201819.15952-9-albert.aribaud@3adev.fr> <20180418201819.15952-10-albert.aribaud@3adev.fr> <20180418201819.15952-11-albert.aribaud@3adev.fr> <20180418201819.15952-12-albert.aribaud@3adev.fr> <20180418201819.15952-13-albert.aribaud@3adev.fr> <20180418201819.15952-14-albert.aribaud@3adev.fr> <20180418201819.15952-15-albert.aribaud@3adev.fr> <20180418201819.15952-16-albert.aribaud@3adev.fr> <20180418201819.15952-17-albert.aribaud@3adev.fr> <20180418201819.15952-18-albert.aribaud@3adev.fr> <20180418201819.15952-19-albert.aribaud@3adev.fr> <20180418201819.15952-20-albert.aribaud@3adev.fr> <20180418201819.15952-21-albert.aribaud@3adev.fr> <20180418201819.15952-22-albert.aribaud@3adev.fr> <20180418201819.15952-23-albert.aribaud@3adev.fr> <20180418201819.15952-24-albert.aribaud@3adev.fr> <20180418201819.15952-25-albert.aribaud@3adev.fr> <20180418201819.15952-26-albert.aribaud@3adev.fr> <20180418201819.15952-27-albert.aribaud@3adev.fr> <20180418201819.15952-28-albert.aribaud@3adev.fr> <20180418201819.15952-29-albert.aribaud@3adev.fr> <20180418201819.15952-30-albert.aribaud@3adev.fr> <20180418201819.15952-31-albert.aribaud@3adev.fr> <20180418201819.15952-32-albert.aribaud@3adev.fr> <20180418201819.15952-33-albert.aribaud@3adev.fr> <20180418201819.15952-34-albert.aribaud@3adev.fr> <20180418201819.15952-35-albert.aribaud@3adev.fr> <20180418201819.15952-36-albert.aribaud@3adev.fr> <20180418201819.15952-37-albert.aribaud@3adev.fr> <20180418201819.15952-38-albert.aribaud@3adev.fr> <20180418201819.15952-39-albert.aribaud@3adev.fr> <20180418201819.15952-40-albert.aribaud@3adev.fr> --- include/time.h | 3 +++ misc/Makefile | 3 ++- misc/utimes.c | 15 +++++++++++ sysdeps/unix/sysv/linux/utimes64.c | 54 ++++++++++++++++++++++++++++++++++++++ time/Versions | 1 + 5 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/utimes64.c diff --git a/include/time.h b/include/time.h index 68c52220fd..5e601adbd4 100644 --- a/include/time.h +++ b/include/time.h @@ -43,6 +43,9 @@ extern int __clock_nanosleep64 (clockid_t __clock_id, int __flags, const struct __timespec64 *__req, struct __timespec64 *__rem); +extern int __utimes64 (const char *file, + const struct __timeval64 tvp[2]); + /* Now define the internal interfaces. */ struct tm; diff --git a/misc/Makefile b/misc/Makefile index a5076b3672..f3463620fb 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -70,7 +70,8 @@ routines := brk sbrk sstk ioctl \ getloadavg getclktck \ fgetxattr flistxattr fremovexattr fsetxattr getxattr \ listxattr lgetxattr llistxattr lremovexattr lsetxattr \ - removexattr setxattr getauxval ifunc-impl-list makedev + removexattr setxattr getauxval ifunc-impl-list makedev \ + utimes64 generated += tst-error1.mtrace tst-error1-mem.out diff --git a/misc/utimes.c b/misc/utimes.c index 0ae6946142..cdb43f6688 100644 --- a/misc/utimes.c +++ b/misc/utimes.c @@ -38,3 +38,18 @@ __utimes (const char *file, const struct timeval tvp[2]) weak_alias (__utimes, utimes) stub_warning (utimes) + +int +__utimes64 (const char *file, const struct __timeval64 tvp[2]) +{ + if (file == NULL) + { + __set_errno (EINVAL); + return -1; + } + + __set_errno (ENOSYS); + return -1; +} + +stub_warning (__utimes64) diff --git a/sysdeps/unix/sysv/linux/utimes64.c b/sysdeps/unix/sysv/linux/utimes64.c new file mode 100644 index 0000000000..eb9022a2d9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/utimes64.c @@ -0,0 +1,54 @@ +/* Copyright (C) 1995-2018 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 + . */ + +#include +#include +#include +#include +#include + + +/* Consider moving to syscalls.list. */ + +extern int __y2038_linux_support; + +int +__utimes64 (const char *file, const struct __timeval64 tvp[2]) +{ + struct timeval tv32[2], *tvp32 = NULL; + + if (__y2038_linux_support) + { + /* TODO: implement using 64-bit time syscall */ + } + + if (tvp != NULL) + { + if (tvp[0].tv_sec > INT_MAX || tvp[1].tv_sec > INT_MAX) + { + __set_errno(EOVERFLOW); + return -1; + } + tv32[0].tv_sec = tvp[0].tv_sec; + tv32[0].tv_usec = tvp[0].tv_usec; + tv32[1].tv_sec = tvp[1].tv_sec; + tv32[1].tv_usec = tvp[1].tv_usec; + tvp32 = tv32; + } + + return INLINE_SYSCALL (utimes, 2, file, tvp32); +} diff --git a/time/Versions b/time/Versions index 6b1ca80c1e..86ced5a7c7 100644 --- a/time/Versions +++ b/time/Versions @@ -88,5 +88,6 @@ libc { __settimeofday64; __time64; __stime64; + __utimes64; } }