aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>2017-09-08 00:41:59 +0200
committerAlbert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>2018-10-24 12:53:27 +0200
commit2ea80487a743e78a2f0c8962ec2d4837e9c0a8d0 (patch)
tree504f3d1ad7cbeeab2bb85a6248140afb25993652
parent3f87e785beefd9966f386518db69a010af1ea7b0 (diff)
downloadglibc-2ea80487a743e78a2f0c8962ec2d4837e9c0a8d0.tar
glibc-2ea80487a743e78a2f0c8962ec2d4837e9c0a8d0.tar.gz
glibc-2ea80487a743e78a2f0c8962ec2d4837e9c0a8d0.tar.bz2
glibc-2ea80487a743e78a2f0c8962ec2d4837e9c0a8d0.zip
Y2038: add function __settimeofday64
Implementing a 64-bit settimeofday requires adding a new file to build under time/ and we cannot name that new file 'settimeofday.c' or it will break the 32-bit settimeofday file symbol, so we call it 'settimeofday64.c'.
-rw-r--r--include/sys/time.h2
-rw-r--r--sysdeps/unix/sysv/linux/settimeofday64.c39
-rw-r--r--time/Makefile2
-rw-r--r--time/Versions1
-rw-r--r--time/settimeofday.c8
5 files changed, 51 insertions, 1 deletions
diff --git a/include/sys/time.h b/include/sys/time.h
index ed73a445bf..792fe84568 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -29,6 +29,8 @@ extern int __gettimeofday64 (struct __timeval64 *__tv,
extern int __settimeofday (const struct timeval *__tv,
const struct timezone *__tz)
attribute_hidden;
+extern int __settimeofday64 (const struct __timeval64 *__tv,
+ const struct timezone *__tz);
extern int __adjtime (const struct timeval *__delta,
struct timeval *__olddelta);
extern int __getitimer (enum __itimer_which __which,
diff --git a/sysdeps/unix/sysv/linux/settimeofday64.c b/sysdeps/unix/sysv/linux/settimeofday64.c
new file mode 100644
index 0000000000..1a9fa23911
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/settimeofday64.c
@@ -0,0 +1,39 @@
+/* Set the current time of day and timezone information.
+
+ Copyright (C) 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 <sysdep.h>
+#include <errno.h>
+#include <sys/time.h>
+
+int __settimeofday64(const struct __timeval64 *tv,
+ const struct timezone *tz)
+{
+ struct timeval tv32;
+
+ if (tv && tv->tv_sec > INT_MAX)
+ {
+ __set_errno(EOVERFLOW);
+ return -1;
+ }
+
+ tv32.tv_sec = tv->tv_sec;
+ tv32.tv_usec = tv->tv_usec;
+
+ return __settimeofday(&tv32, tz);
+}
diff --git a/time/Makefile b/time/Makefile
index c466206022..8354b26ab2 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -32,7 +32,7 @@ headers := time.h sys/time.h sys/timeb.h bits/time.h \
routines := offtime asctime clock ctime ctime_r difftime \
gmtime localtime mktime time \
gettimeofday settimeofday adjtime tzset \
- gettimeofday64 \
+ gettimeofday64 settimeofday64 \
tzfile getitimer setitimer \
stime dysize timegm ftime \
getdate strptime strptime_l \
diff --git a/time/Versions b/time/Versions
index f1b4cbfbc3..1b178e43f9 100644
--- a/time/Versions
+++ b/time/Versions
@@ -81,5 +81,6 @@ libc {
__futimes64;
__lutimes64;
__gettimeofday64;
+ __settimeofday64;
}
}
diff --git a/time/settimeofday.c b/time/settimeofday.c
index 01bf4b032d..000ed21849 100644
--- a/time/settimeofday.c
+++ b/time/settimeofday.c
@@ -29,3 +29,11 @@ __settimeofday (const struct timeval *tv, const struct timezone *tz)
stub_warning (settimeofday)
weak_alias (__settimeofday, settimeofday)
+
+int
+__settimeofday64 (const struct timeval *tv, const struct timezone *tz)
+{
+ __set_errno (ENOSYS);
+ return -1;
+}
+stub_warning (__settimeofday64)