X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=util-linux%2Frtcwake.c;h=66b08e34393090497df3785614bcd77254af435e;hb=baad6d889da960ff3336f16a8e5d25518f832c73;hp=ee2f031b42333f8e2b143da1015f0caf647fe7ee;hpb=adf922ec2800d53f5eedd469cf99c55946caeb43;p=oweals%2Fbusybox.git

diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index ee2f031b4..66b08e343 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -30,8 +30,6 @@
 #define SYS_POWER_PATH "/sys/power/state"
 #define DEFAULT_MODE   "standby"
 
-static time_t rtc_time;
-
 static NOINLINE bool may_wakeup(const char *rtcname)
 {
 	ssize_t ret;
@@ -50,9 +48,9 @@ static NOINLINE bool may_wakeup(const char *rtcname)
 	return strncmp(buf, "enabled\n", 8) == 0;
 }
 
-static NOINLINE void setup_alarm(int fd, time_t *wakeup)
+static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time)
 {
-	struct tm *tm;
+	struct tm *ptm;
 	struct linux_rtc_wkalrm	wake;
 
 	/* The wakeup time is in POSIX time (more or less UTC).
@@ -65,14 +63,14 @@ static NOINLINE void setup_alarm(int fd, time_t *wakeup)
 	 * Else mode is local so the time given to the RTC
 	 * will instead use the local time zone.
 	 */
-	tm = localtime(wakeup);
-
-	wake.time.tm_sec = tm->tm_sec;
-	wake.time.tm_min = tm->tm_min;
-	wake.time.tm_hour = tm->tm_hour;
-	wake.time.tm_mday = tm->tm_mday;
-	wake.time.tm_mon = tm->tm_mon;
-	wake.time.tm_year = tm->tm_year;
+	ptm = localtime(wakeup);
+
+	wake.time.tm_sec = ptm->tm_sec;
+	wake.time.tm_min = ptm->tm_min;
+	wake.time.tm_hour = ptm->tm_hour;
+	wake.time.tm_mday = ptm->tm_mday;
+	wake.time.tm_mon = ptm->tm_mon;
+	wake.time.tm_year = ptm->tm_year;
 	/* wday, yday, and isdst fields are unused by Linux */
 	wake.time.tm_wday = -1;
 	wake.time.tm_yday = -1;
@@ -102,6 +100,8 @@ static NOINLINE void setup_alarm(int fd, time_t *wakeup)
 int rtcwake_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 {
+	time_t rtc_time;
+
 	unsigned opt;
 	const char *rtcname = NULL;
 	const char *suspend;
@@ -141,7 +141,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 		seconds = xatoi(opt_seconds);
 	if (opt & RTCWAKE_OPT_TIME)
 		/* alarm time, time_t (absolute, seconds since 1/1 1970 UTC) */
-		alarm_time = xatoi(opt_time);
+		alarm_time = xatol(opt_time);
 
 	if (!alarm_time && !seconds)
 		bb_error_msg_and_die("must provide wake time");
@@ -160,9 +160,12 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 
 	/* relative or absolute alarm time, normalized to time_t */
 	sys_time = time(NULL);
-	if (sys_time == (time_t)-1)
-		bb_perror_msg_and_die("read system time");
-	rtc_time = rtc_read_time(fd, utc);
+	{
+		struct tm tm_time;
+		rtc_read_tm(&tm_time, fd);
+		rtc_time = rtc_tm2time(&tm_time, utc);
+	}
+
 
 	if (alarm_time) {
 		if (alarm_time < sys_time)
@@ -170,11 +173,11 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 		alarm_time += sys_time - rtc_time;
 	} else
 		alarm_time = rtc_time + seconds + 1;
-	setup_alarm(fd, &alarm_time);
+	setup_alarm(fd, &alarm_time, rtc_time);
 
 	sync();
 	printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time));
-	fflush(stdout);
+	fflush_all();
 	usleep(10 * 1000);
 
 	if (strcmp(suspend, "on"))