Changeset 3910 in MondoRescue

Timestamp:

May 8, 2025, 5:24:25 PM (3 months ago)

Author:

Bruno Cornec

Message:

Remove stime usage

based on commit d3539be8f27b8cbfdfee460fe08299158f08bcd9 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@…>

stime() has been deprecated in glibc 2.31 and replaced with
clock_settime(). Let's replace the stime() function calls with
clock_settime() in preperation.

Location:

branches/3.3/mindi-busybox

Files:

• coreutils/date.c (modified) (1 diff)
• libbb/missing_syscalls.c (modified) (1 diff)
• util-linux/rdate.c (modified) (1 diff)

branches/3.3/mindi-busybox/coreutils/date.c

@@ -299 +299 @@
 
         /* if setting time, set it */
-        if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
+        if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
             bb_perror_msg("can't set date");
         }

branches/3.3/mindi-busybox/libbb/missing_syscalls.c

@@ -15 +15 @@
 {
     return syscall(__NR_getsid, pid);
-}
-
-int stime(const time_t *t)
-{
-    struct timeval tv;
-    tv.tv_sec = *t;
-    tv.tv_usec = 0;
-    return settimeofday(&tv, NULL);
 }
 

branches/3.3/mindi-busybox/util-linux/rdate.c

@@ -68 +68 @@
         if (current_time == remote_time)
             bb_error_msg("current time matches remote time");
-        else
-            if (stime(&remote_time) < 0)
+        else {
+            struct timespec ts;
+            ts.tv_sec = remote_time;
+            ts.tv_nsec = 0;
+            if (clock_settime(CLOCK_REALTIME, &ts) < 0)
                 bb_perror_msg_and_die("can't set time of day");
+        }
     }