summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2019-08-16 15:03:16 -0400
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-10-30 17:05:14 -0300
commit12cbde1dae6fa4a9a792b64564c7e0debf7544cc (patch)
treefac04463cae1c6384358e3823d80e3ed051f72b1 /time
parent4a39c34c4f85de57fb4e648cfa1e774437d69680 (diff)
downloadglibc-12cbde1dae6fa4a9a792b64564c7e0debf7544cc.tar.gz
glibc-12cbde1dae6fa4a9a792b64564c7e0debf7544cc.tar.xz
glibc-12cbde1dae6fa4a9a792b64564c7e0debf7544cc.zip
Use clock_settime to implement stime; withdraw stime.
Unconditionally, on all ports, use clock_settime to implement stime,
not settimeofday or a direct syscall.  Then convert stime into a
compatibility symbol and remove its prototype from time.h.

Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diffstat (limited to 'time')
-rw-r--r--time/stime.c25
-rw-r--r--time/time.h6
2 files changed, 13 insertions, 18 deletions
diff --git a/time/stime.c b/time/stime.c
index a53c0e86ae..6ea3b6dcc1 100644
--- a/time/stime.c
+++ b/time/stime.c
@@ -15,23 +15,24 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
+#include <shlib-compat.h>
+
+#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_31)
+
 #include <time.h>
-#include <stddef.h>
 
 /* Set the system clock to *WHEN.  */
 
 int
-stime (const time_t *when)
+attribute_compat_text_section
+__stime (const time_t *when)
 {
-  if (when == NULL)
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
-
-  __set_errno (ENOSYS);
-  return -1;
+  struct timespec ts;
+  ts.tv_sec = *when;
+  ts.tv_nsec = 0;
+
+  return __clock_settime (CLOCK_REALTIME, &ts);
 }
 
-stub_warning (stime)
+compat_symbol (libc, __stime, stime, GLIBC_2_0);
+#endif
diff --git a/time/time.h b/time/time.h
index 72a1078d2c..7daaacce16 100644
--- a/time/time.h
+++ b/time/time.h
@@ -175,12 +175,6 @@ extern int daylight;
 extern long int timezone;
 #endif
 
-#ifdef __USE_MISC
-/* Set the system time to *WHEN.
-   This call is restricted to the superuser.  */
-extern int stime (const time_t *__when) __THROW;
-#endif
-
 
 /* Nonzero if YEAR is a leap year (every 4 years,
    except every 100th isn't, and every 400th is).  */