From 977bc6a1374ed468ec96e2202757be0c8b3592ed Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 15 Feb 2008 07:19:03 +0000 Subject: we need to pass back the rtc device name that was actually used so that we can turn around and check its sysfs status --- libbb/rtc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'libbb/rtc.c') diff --git a/libbb/rtc.c b/libbb/rtc.c index 4cbf32206..78f10c65d 100644 --- a/libbb/rtc.c +++ b/libbb/rtc.c @@ -40,21 +40,23 @@ int rtc_adjtime_is_utc(void) return utc; } -int rtc_xopen(const char *default_rtc, int flags) +int rtc_xopen(const char **default_rtc, int flags) { int rtc; - if (!default_rtc) { - rtc = open("/dev/rtc", flags); + if (!*default_rtc) { + *default_rtc = "/dev/rtc"; + rtc = open(*default_rtc, flags); if (rtc >= 0) return rtc; - rtc = open("/dev/rtc0", flags); + *default_rtc = "/dev/rtc0"; + rtc = open(*default_rtc, flags); if (rtc >= 0) return rtc; - default_rtc = "/dev/misc/rtc"; + *default_rtc = "/dev/misc/rtc"; } - return xopen(default_rtc, flags); + return xopen(*default_rtc, flags); } time_t rtc_read_time(int fd, int utc) -- cgit v1.2.3