Y2038: add function __utimes64

diff --git a/include/time.h b/include/time.h
index 2bfba396fe8eb8f6e04f56c71156014771ee80d1..5ea0aa3303171e117e21e3aea2648255c5479e9f 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -50,6 +50,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 7ced1eac88e02330c84cec12a7c4d9b7e8139d3a..e30685093ea0f01675f9dadff7d9b0805c73c223 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -71,7 +71,7 @@ routines := brk sbrk sstk ioctl \
            fgetxattr flistxattr fremovexattr fsetxattr getxattr \
            listxattr lgetxattr llistxattr lremovexattr lsetxattr \
            removexattr setxattr getauxval ifunc-impl-list makedev \
-           allocate_once y2038-support
+           allocate_once y2038-support utimes64
 
 generated += tst-error1.mtrace tst-error1-mem.out \
   tst-allocate_once.mtrace tst-allocate_once-mem.out

diff --git a/misc/utimes.c b/misc/utimes.c
index 0ae6946142972da6cc2b25ecbe7d096288a81e95..cdb43f6688a5224426de08b201dc91781201aa70 100644 (file)
--- 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 (file)
index 0000000..b17f997
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/utimes64.c
@@ -0,0 +1,48 @@
+/* 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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <stddef.h>
+#include <utime.h>
+#include <sys/time.h>
+#include <sysdep.h>
+#include <fcntl.h>
+
+/* 64-bit-time variant */
+
+int
+__utimes64 (const char *file, const struct __timeval64 tvp[2])
+{
+  struct timespec ts32[2], *tsp32 = NULL;
+
+  if (tvp != NULL)
+    {
+      if (tvp[0].tv_sec > INT_MAX || tvp[1].tv_sec > INT_MAX)
+        {
+          __set_errno(EOVERFLOW);
+          return -1;
+        }
+      ts32[0].tv_sec = tvp[0].tv_sec;
+      ts32[0].tv_nsec = tvp[0].tv_usec * 1000;
+      ts32[1].tv_sec = tvp[1].tv_sec;
+      ts32[1].tv_nsec = tvp[1].tv_usec * 1000;
+      tsp32 = ts32;
+    }
+
+  /* use utimensat rather than utimes which not all arches can use */
+  return INLINE_SYSCALL (utimensat, 4, AT_FDCWD, file, tsp32, 0);
+}

diff --git a/time/Versions b/time/Versions
index e8b63d25aec0dbd27dca2ae4b6c46dd62d15017e..c28dab69a15dee293c06264fcd89cd53bb6ea69b 100644 (file)
--- a/time/Versions
+++ b/time/Versions
@@ -84,5 +84,6 @@ libc {
     __settimeofday64;
     __time64;
     __stime64;
+    __utimes64;
   }
 }