From: J William Piggott <elseifthen@gmx.com>
Date: Sun, 22 Oct 2017 00:40:58 +0000 (-0400)
Subject: hwclock: use reentrant time conversion functions
X-Git-Tag: v2.32-rc1~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01d971945c2677f8e766c329ae6aaafd66dd9f32;p=thirdparty%2Futil-linux.git

hwclock: use reentrant time conversion functions

Signed-off-by: J William Piggott <elseifthen@gmx.com>
---

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index c93a5fd65f..8ff33474e0 100644
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -375,9 +375,9 @@ set_hardware_clock(const struct hwclock_control *ctl, const time_t newtime)
 	 */
 
 	if (ctl->universal)
-		new_broken_time = *gmtime(&newtime);
+		gmtime_r(&newtime, &new_broken_time);
 	else
-		new_broken_time = *localtime(&newtime);
+		localtime_r(&newtime, &new_broken_time);
 
 	if (ctl->debug)
 		printf(_("Setting Hardware Clock to %.2d:%.2d:%.2d "
@@ -600,13 +600,13 @@ static int
 set_system_clock(const struct hwclock_control *ctl,
 		 const struct timeval newtime)
 {
-	struct tm *broken;
+	struct tm broken;
 	int minuteswest;
 	int rc = 0;
 	const struct timezone tz_utc = { 0 };
 
-	broken = localtime(&newtime.tv_sec);
-	minuteswest = -get_gmtoff(broken) / 60;
+	localtime_r(&newtime.tv_sec, &broken);
+	minuteswest = -get_gmtoff(&broken) / 60;
 
 	if (ctl->debug) {
 		if (ctl->hctosys && !ctl->universal)