diff options
| author | Eddie James | 2020-08-10 09:59:02 -0500 |
|---|---|---|
| committer | Denys Vlasenko | 2020-08-15 22:29:00 +0200 |
| commit | 1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b (patch) | |
| tree | ce68e4c6412be03ebe27f71ea6b55b9f2de5b2ed | |
| parent | a77f3ecf68c63081934f5e0800eab80b5098bb24 (diff) | |
| download | busybox-1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b.zip busybox-1a5d6fcbb5e606ab4acdf22afa26361a25f1d43b.tar.gz | |
hwclock: Fix settimeofday for glibc v2.31+
The glibc implementation changed for settimeofday, resulting in "invalid
argument" error when attempting to set both timezone and time with a single
call. Fix this by calling settimeofday twice
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | util-linux/hwclock.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index 357906c..e85bca2 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"); } |