diff options
author | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2017-09-08 00:41:56 +0200 |
---|---|---|
committer | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2018-04-11 22:39:44 +0200 |
commit | c8bff764fa217d0ed02442da82b45b6f0804898c (patch) | |
tree | 0b9712d8694543e1ecc4285333eac2e36daf439a | |
parent | 640aac54c154fcc298bf2cc7d3ab26454c535363 (diff) | |
download | glibc-c8bff764fa217d0ed02442da82b45b6f0804898c.tar.gz |
Y2038: add function __stime64
These implementations use only 32-bit time kernel syscalls.
Therefore, stime() will always set errno to EOVERFLOW and return -1 for dates beyond Y2038.
-rw-r--r-- | sysdeps/unix/sysv/linux/stime.c | 41 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/stime64.c | 54 | ||||
-rw-r--r-- | time/Makefile | 2 | ||||
-rw-r--r-- | time/Versions | 1 | ||||
-rw-r--r-- | time/stime.c | 17 |
5 files changed, 114 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/stime.c b/sysdeps/unix/sysv/linux/stime.c new file mode 100644 index 0000000000..5a40626ef3 --- /dev/null +++ b/sysdeps/unix/sysv/linux/stime.c @@ -0,0 +1,41 @@ +/* Set the system clock on a Linux kernel + + Copyright (C) 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 <stddef.h> /* For NULL. */ +#include <sys/time.h> +#include <time.h> + +/* Set the system clock to *WHEN. */ + +int +stime (const time_t *when) +{ + struct timeval tv; + + if (when == NULL) + { + __set_errno (EINVAL); + return -1; + } + + tv.tv_sec = *when; + tv.tv_usec = 0; + return __settimeofday (&tv, (struct timezone *) 0); +} diff --git a/sysdeps/unix/sysv/linux/stime64.c b/sysdeps/unix/sysv/linux/stime64.c new file mode 100644 index 0000000000..94605d2da9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/stime64.c @@ -0,0 +1,54 @@ +/* Set the system clock on a Linux kernel + + Copyright (C) 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 <stddef.h> /* For NULL. */ +#include <sys/time.h> +#include <time.h> + +/* Set the system clock to *WHEN. */ + +extern int __y2038_linux_support; + +int +__stime64 (const __time64_t *when) +{ + struct timeval tv32; + + if (when == NULL) + { + __set_errno (EINVAL); + return -1; + } + + if (__y2038_linux_support) + { + /* TODO: implement 64-bit-time syscall case */ + } + + if (*when > INT_MAX) + { + __set_errno (EOVERFLOW); + return -1; + } + + tv32.tv_sec = *when; + tv32.tv_usec = 0; + return __settimeofday (&tv32, (struct timezone *) 0); +} diff --git a/time/Makefile b/time/Makefile index 172e8438f2..2d57b7a7e0 100644 --- a/time/Makefile +++ b/time/Makefile @@ -31,7 +31,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 \ - time64 \ + time64 stime64 \ gettimeofday settimeofday adjtime tzset \ tzfile getitimer setitimer \ stime dysize timegm ftime \ diff --git a/time/Versions b/time/Versions index 503a4f46cc..2685126271 100644 --- a/time/Versions +++ b/time/Versions @@ -85,5 +85,6 @@ libc { __futimes64; __lutimes64; __time64; + __stime64; } } diff --git a/time/stime.c b/time/stime.c index 0378e23888..5d22aaae61 100644 --- a/time/stime.c +++ b/time/stime.c @@ -35,3 +35,20 @@ stime (const time_t *when) } stub_warning (stime) + +/* 64-bit time version */ + +int +__stime64 (const __time64_t *when) +{ + if (when == NULL) + { + __set_errno (EINVAL); + return -1; + } + + __set_errno (ENOSYS); + return -1; +} + +stub_warning (__stime64) |