Bump to version 1.22.1

[platform/upstream/busybox.git] / util-linux / rtcwake.c

diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index f90f73c..735a298 100644 (file)
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -3,7 +3,7 @@
  *
  * This version was taken from util-linux and scrubbed down for busybox.
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  *
  * 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
@@ -23,6 +23,29 @@
  * That flag should not be needed on systems with adjtime support.
  */
 
+//usage:#define rtcwake_trivial_usage
+//usage:       "[-a | -l | -u] [-d DEV] [-m MODE] [-s SEC | -t TIME]"
+//usage:#define rtcwake_full_usage "\n\n"
+//usage:       "Enter a system sleep state until specified wakeup time\n"
+//usage:       IF_LONG_OPTS(
+//usage:     "\n       -a,--auto       Read clock mode from adjtime"
+//usage:     "\n       -l,--local      Clock is set to local time"
+//usage:     "\n       -u,--utc        Clock is set to UTC time"
+//usage:     "\n       -d,--device=DEV Specify the RTC device"
+//usage:     "\n       -m,--mode=MODE  Set the sleep state (default: standby)"
+//usage:     "\n       -s,--seconds=SEC Set the timeout in SEC seconds from now"
+//usage:     "\n       -t,--time=TIME  Set the timeout to TIME seconds from epoch"
+//usage:       )
+//usage:       IF_NOT_LONG_OPTS(
+//usage:     "\n       -a      Read clock mode from adjtime"
+//usage:     "\n       -l      Clock is set to local time"
+//usage:     "\n       -u      Clock is set to UTC time"
+//usage:     "\n       -d DEV  Specify the RTC device"
+//usage:     "\n       -m MODE Set the sleep state (default: standby)"
+//usage:     "\n       -s SEC  Set the timeout in SEC seconds from now"
+//usage:     "\n       -t TIME Set the timeout to TIME seconds from epoch"
+//usage:       )
+
 #include "libbb.h"
 #include "rtc_.h"
 
@@ -35,9 +58,8 @@ static NOINLINE bool may_wakeup(const char *rtcname)
        ssize_t ret;
        char buf[128];
 
-       /* strip the '/dev/' from the rtcname here */
-       if (!strncmp(rtcname, "/dev/", 5))
-               rtcname += 5;
+       /* strip "/dev/" from the rtcname here */
+       rtcname = skip_dev_pfx(rtcname);
 
        snprintf(buf, sizeof(buf), SYS_RTC_PATH, rtcname);
        ret = open_read_close(buf, buf, sizeof(buf));
@@ -50,8 +72,8 @@ static NOINLINE bool may_wakeup(const char *rtcname)
 
 static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time)
 {
-       struct tm *tm;
-       struct linux_rtc_wkalrm wake;
+       struct tm *ptm;
+       struct linux_rtc_wkalrm wake;
 
        /* The wakeup time is in POSIX time (more or less UTC).
         * Ideally RTCs use that same time; but PCs can't do that
@@ -63,14 +85,14 @@ static NOINLINE void setup_alarm(int fd, time_t *wakeup, time_t rtc_time)
         * 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;
@@ -160,7 +182,12 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 
        /* relative or absolute alarm time, normalized to time_t */
        sys_time = time(NULL);
-       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)
@@ -172,7 +199,7 @@ int rtcwake_main(int argc UNUSED_PARAM, char **argv)
 
        sync();
        printf("wakeup from \"%s\" at %s", suspend, ctime(&alarm_time));
-       fflush(NULL);
+       fflush_all();
        usleep(10 * 1000);
 
        if (strcmp(suspend, "on"))