Y2038: implement Y2038-ready nanosleep64

4 files changed, 71 insertions, 1 deletions

diff --git a/time/Makefile b/time/Makefile
index 5fb26f6dbf..d50c3ddfd8 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -37,7 +37,7 @@ routines := offtime asctime clock ctime ctime_r difftime \
 	    getdate strptime strptime_l			 \
 	    strftime wcsftime strftime_l wcsftime_l	 \
 	    timespec_get                                 \
-	    settimeofday64
+	    settimeofday64 nanosleep64
 aux :=	    era alt_digit lc-time-cleanup
 
 tests	:= test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
diff --git a/time/Versions b/time/Versions
index a007efa530..d7626cc3bb 100644
--- a/time/Versions
+++ b/time/Versions
@@ -73,5 +73,6 @@ libc {
     __timespec_get64;
     __time_t64; __stime_t64;
     __gettimeofday_t64; __settimeofday_t64;
+    __nanosleep_t64;
   }
 }
diff --git a/time/nanosleep64.c b/time/nanosleep64.c
new file mode 100644
index 0000000000..a099f9317b
--- /dev/null
+++ b/time/nanosleep64.c
@@ -0,0 +1,61 @@
+/* Copyright (C) 1996-2017 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 <time.h>
+
+extern int __y2038_linux_support;
+
+/* Pause execution for a number of nanoseconds.  */
+int
+__nanosleep_t64 (const struct __timespec64 *requested_time,
+	         struct __timespec64 *remaining)
+{
+  struct timespec treq32, *treqp32 = NULL;
+  struct timespec trem32, *tremp32 = NULL;
+
+  if (__y2038_linux_support)
+  {
+    /* TODO: use 64-bit time syscalls */
+  }
+
+  if (requested_time)
+  {
+    if (requested_time->tv_sec > INT_MAX)
+    {
+      __set_errno(EOVERFLOW);
+      return -1;
+    }
+    treq32.tv_sec = requested_time->tv_sec;
+    treq32.tv_nsec = requested_time->tv_nsec;
+    treqp32 = & treq32;
+  }
+
+  if (remaining)
+    tremp32 = &trem32;
+
+  int result = nanosleep(treqp32, tremp32);
+
+  if (result == 1 && errno == EINTR && remaining)
+  {
+    remaining->tv_sec = trem32.tv_sec;
+    remaining->tv_nsec = trem32.tv_nsec;
+    remaining->tv_pad = 0;
+  }
+
+  return result;
+}
diff --git a/time/time.h b/time/time.h
index 58faa7c034..1ce762eebc 100644
--- a/time/time.h
+++ b/time/time.h
@@ -310,6 +310,14 @@ extern int dysize (int __year) __THROW  __attribute__ ((__const__));
 
    This function is a cancellation point and therefore not marked with
    __THROW.  */
+#ifdef __USE_TIME_BITS64
+# if defined(__REDIRECT)
+extern int __REDIRECT (nanosleep, (const struct timespec *__requested_time,
+		      struct timespec *__remaining), __nanosleep_t64);
+# else
+# define nanosleep __nanosleep_t64
+# endif
+#endif
 extern int nanosleep (const struct timespec *__requested_time,
 		      struct timespec *__remaining);