From patchwork Thu Sep  7 22:41:57 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Albert ARIBAUD <albert.aribaud@3adev.fr>
X-Patchwork-Id: 22738
Received: (qmail 89851 invoked by alias); 7 Sep 2017 22:44:35 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 89667 invoked by uid 89); 7 Sep 2017 22:44:35 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00, GIT_PATCH_0,
	GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,
	KAM_LAZY_DOMAIN_SECURITY,
	RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2
	spammy=Hx-languages-length:2672
X-HELO: smtp6-g21.free.fr
From: "Albert ARIBAUD (3ADEV)" <albert.aribaud@3adev.fr>
To: libc-alpha@sourceware.org
Cc: "Albert ARIBAUD (3ADEV)" <albert.aribaud@3adev.fr>
Subject: [RFC PATCH 30/52] Y2038: add function __utimes_t64
Date: Fri,  8 Sep 2017 00:41:57 +0200
Message-Id: <20170907224219.12483-31-albert.aribaud@3adev.fr>
In-Reply-To: <20170907224219.12483-30-albert.aribaud@3adev.fr>
References: <20170907224219.12483-1-albert.aribaud@3adev.fr>
	<20170907224219.12483-2-albert.aribaud@3adev.fr>
	<20170907224219.12483-3-albert.aribaud@3adev.fr>
	<20170907224219.12483-4-albert.aribaud@3adev.fr>
	<20170907224219.12483-5-albert.aribaud@3adev.fr>
	<20170907224219.12483-6-albert.aribaud@3adev.fr>
	<20170907224219.12483-7-albert.aribaud@3adev.fr>
	<20170907224219.12483-8-albert.aribaud@3adev.fr>
	<20170907224219.12483-9-albert.aribaud@3adev.fr>
	<20170907224219.12483-10-albert.aribaud@3adev.fr>
	<20170907224219.12483-11-albert.aribaud@3adev.fr>
	<20170907224219.12483-12-albert.aribaud@3adev.fr>
	<20170907224219.12483-13-albert.aribaud@3adev.fr>
	<20170907224219.12483-14-albert.aribaud@3adev.fr>
	<20170907224219.12483-15-albert.aribaud@3adev.fr>
	<20170907224219.12483-16-albert.aribaud@3adev.fr>
	<20170907224219.12483-17-albert.aribaud@3adev.fr>
	<20170907224219.12483-18-albert.aribaud@3adev.fr>
	<20170907224219.12483-19-albert.aribaud@3adev.fr>
	<20170907224219.12483-20-albert.aribaud@3adev.fr>
	<20170907224219.12483-21-albert.aribaud@3adev.fr>
	<20170907224219.12483-22-albert.aribaud@3adev.fr>
	<20170907224219.12483-23-albert.aribaud@3adev.fr>
	<20170907224219.12483-24-albert.aribaud@3adev.fr>
	<20170907224219.12483-25-albert.aribaud@3adev.fr>
	<20170907224219.12483-26-albert.aribaud@3adev.fr>
	<20170907224219.12483-27-albert.aribaud@3adev.fr>
	<20170907224219.12483-28-albert.aribaud@3adev.fr>
	<20170907224219.12483-29-albert.aribaud@3adev.fr>
	<20170907224219.12483-30-albert.aribaud@3adev.fr>

Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>
---
 include/sys/time.h                   |  6 ++++++
 misc/utimes.c                        | 15 +++++++++++++++
 sysdeps/unix/sysv/linux/arm/Versions |  1 +
 sysdeps/unix/sysv/linux/utimes.c     | 31 +++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+)

diff --git a/include/sys/time.h b/include/sys/time.h
index 95c431f7b3..b46873f6f4 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -20,6 +20,9 @@
 # include <time/sys/time.h>
 
 # ifndef _ISOMAC
+
+#  include <include/time.h>
+
 extern int __gettimeofday (struct timeval *__tv,
 			   struct timezone *__tz);
 libc_hidden_proto (__gettimeofday)
@@ -39,5 +42,8 @@ extern int __utimes (const char *__file, const struct timeval __tvp[2])
 	attribute_hidden;
 extern int __futimes (int fd, const struct timeval tvp[2]) attribute_hidden;
 
+extern int __utimes_t64 (const char *file, const struct __timeval64 tvp[2])
+	attribute_hidden;
+
 # endif
 #endif
diff --git a/misc/utimes.c b/misc/utimes.c
index 73d91ace1c..5bb1a6f963 100644
--- a/misc/utimes.c
+++ b/misc/utimes.c
@@ -37,3 +37,18 @@ __utimes (const char *file, const struct timeval tvp[2])
 weak_alias (__utimes, utimes)
 
 stub_warning (utimes)
+
+int
+__utimes_t64 (const char *file, const struct __timeval64 tvp[2])
+{
+  if (file == NULL)
+    {
+      __set_errno (EINVAL);
+      return -1;
+    }
+
+  __set_errno (ENOSYS);
+  return -1;
+}
+
+stub_warning (__utimes_t64)
diff --git a/sysdeps/unix/sysv/linux/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions
index edac9cf007..68a4cb7384 100644
--- a/sysdeps/unix/sysv/linux/arm/Versions
+++ b/sysdeps/unix/sysv/linux/arm/Versions
@@ -38,5 +38,6 @@ libc {
     __sigtimedwait64;
     __futimes64;
     __lutimes64;
+    __utimes_t64;
   }
 }
diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c
index 038ff20ba0..91d1ac2b53 100644
--- a/sysdeps/unix/sysv/linux/utimes.c
+++ b/sysdeps/unix/sysv/linux/utimes.c
@@ -34,3 +34,34 @@ __utimes (const char *file, const struct timeval tvp[2])
 }
 
 weak_alias (__utimes, utimes)
+
+/* 64-bit time version */
+
+extern int __y2038_linux_support;
+
+int
+__utimes_t64 (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);
+}