emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we need to pass back the rtc device name that was actually used so that we can turn around and check its sysfs status

Browse Source
This commit is contained in:
Mike Frysinger
2008-02-15 07:19:03 +00:00
parent ea915363e7
commit 977bc6a137
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util-linux/rtcwake.c
View File

@ -45,7 +45,7 @@ static int may_wakeup(const char *rtcname)
return 0;
/* wakeup events could be disabled or not supported */
return strcmp(buf, "enabled\n") == 0;
return strncmp(buf, "enabled\n", 8) == 0;
}
static void setup_alarm(int fd, time_t *wakeup)
@ -159,11 +159,11 @@ int rtcwake_main(int argc, char **argv)
/* the rtcname is relative to /dev */
xchdir("/dev");
if (strcmp(suspend, "on") != 0 && !may_wakeup(rtcname))
bb_error_msg_and_die("%s not enabled for wakeup events", rtcname);
/* this RTC must exist and (if we'll sleep) be wakeup-enabled */
fd = rtc_xopen(rtcname, O_RDONLY);
fd = rtc_xopen(&rtcname, O_RDONLY);
if (strcmp(suspend, "on") && !may_wakeup(rtcname))
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);
@ -184,7 +184,7 @@ int rtcwake_main(int argc, char **argv)
fflush(stdout);
usleep(10 * 1000);
if (!strcmp(suspend, "on"))
if (strcmp(suspend, "on"))
suspend_system(suspend);
else {
/* "fake" suspend ... we'll do the delay ourselves */