mkfs_ext2: fix bad comment. no code changes

[oweals/busybox.git] / util-linux / rtcwake.c

diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index a9766caaa2666aea0084e0a8518aaa06474c18ca..66b08e34393090497df3785614bcd77254af435e 100644 (file)
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -3,6 +3,8 @@
  *
  * This version was taken from util-linux and scrubbed down for busybox.
  *
+ * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ *
  * This uses cross-platform Linux interfaces to enter a system sleep state,
  * and leave it no later than a specified time.  It uses any RTC framework
  * driver that supports standard driver model wakeup flags.
@@ -28,9 +30,7 @@
 #define SYS_POWER_PATH "/sys/power/state"
 #define DEFAULT_MODE   "standby"
 
-static time_t rtc_time;
-
-static bool may_wakeup(const char *rtcname)
+static NOINLINE bool may_wakeup(const char *rtcname)
 {
        ssize_t ret;
        char buf[128];
@@ -48,9 +48,9 @@ static bool may_wakeup(const char *rtcname)
        return strncmp(buf, "enabled\n", 8) == 0;
 }
 
-static 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).
@@ -63,14 +63,14 @@ static 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;
@@ -100,6 +100,8 @@ static 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;
@@ -112,7 +114,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
        int utc = -1;
        int fd;
 
-#if ENABLE_GETOPT_LONG
+#if ENABLE_LONG_OPTS
        static const char rtcwake_longopts[] ALIGN1 =
                "auto\0"    No_argument "a"
                "local\0"   No_argument "l"
@@ -139,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");
@@ -157,10 +159,13 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
                bb_error_msg_and_die("%s not enabled for wakeup events", rtcname);
 
        /* relative or absolute alarm time, normalized to time_t */
-       sys_time = time(0);
-       if (sys_time == (time_t)-1)
-               bb_perror_msg_and_die("read system time");
-       rtc_time = rtc_read_time(fd, utc);
+       sys_time = time(NULL);
+       {
+               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)
@@ -168,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"))