aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util-linux/hwclock.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 357906cca..e85bca2b2 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -121,16 +121,20 @@ static void to_sys_clock(const char **pp_rtcname, int utc)
struct timeval tv;
struct timezone tz;
- tz.tz_minuteswest = timezone/60;
+ tz.tz_minuteswest = timezone / 60;
/* ^^^ used to also subtract 60*daylight, but it's wrong:
* daylight!=0 means "this timezone has some DST
* during the year", not "DST is in effect now".
*/
tz.tz_dsttime = 0;
+ /* glibc v2.31+ returns an error if both args are non-NULL */
+ if (settimeofday(NULL, &tz))
+ bb_simple_perror_msg_and_die("settimeofday");
+
tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
tv.tv_usec = 0;
- if (settimeofday(&tv, &tz))
+ if (settimeofday(&tv, NULL))
bb_simple_perror_msg_and_die("settimeofday");
}
@@ -282,7 +286,11 @@ static void set_system_clock_timezone(int utc)
gettimeofday(&tv, NULL);
if (!utc)
tv.tv_sec += tz.tz_minuteswest * 60;
- if (settimeofday(&tv, &tz))
+
+ /* glibc v2.31+ returns an error if both args are non-NULL */
+ if (settimeofday(NULL, &tz))
+ bb_simple_perror_msg_and_die("settimeofday");
+ if (settimeofday(&tv, NULL))
bb_simple_perror_msg_and_die("settimeofday");
}