Changeset 3787 in MondoRescue for tags

Timestamp:

Aug 13, 2022, 12:10:38 AM (22 months ago)

Author:

Bruno Cornec

Message:

Fix the stime function not available with glibc 2.31+

Apply fix coming from ​https://git.busybox.net/busybox/patch/?id=d3539be8f27b8cbfdfee460fe08299158f08bcd9

Location:

tags/3.2.2/mindi-busybox

Files:

• coreutils/date.c (modified) (2 diffs)
• util-linux/rdate.c (modified) (1 diff)

tags/3.2.2/mindi-busybox/coreutils/date.c

@@ -268 +268 @@
 #endif
     }
+#if !ENABLE_FEATURE_DATE_NANO
+    ts.tv_nsec = 0;
+#endif
     localtime_r(&ts.tv_sec, &tm_time);
 
@@ -290 +293 @@
             tm_time.tm_isdst = -1;
         ts.tv_sec = validate_tm_time(date_str, &tm_time);
+        ts.tv_nsec = 0;
 
         maybe_set_utc(opt);
 
         /* 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");
         }

tags/3.2.2/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)
-                bb_perror_msg_and_die("can't set time of day");
+        else {
+            struct timespec ts;
+            ts.tv_sec = remote_time;
+            ts.tv_nsec = 0;
+            if (clock_settime(CLOCK_REALTIME, &ts) < 0)
+                bb_simple_perror_msg_and_die("can't set time of day");
     }