aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-11-10 17:14:11 -0600
committerRob Landley <rob@landley.net>2014-11-10 17:14:11 -0600
commit72f8a5f7fedeb81c99044d3443872ae91b5ecfec (patch)
tree1e933df710300194771eecf871f9b66fc4c96846
parent4483eaadba149a5286a26a292f72631793b4826a (diff)
downloadtoybox-72f8a5f7fedeb81c99044d3443872ae91b5ecfec.tar.gz
First cleanup pass on hwclock.
-rw-r--r--toys/pending/hwclock.c100
1 files changed, 48 insertions, 52 deletions
diff --git a/toys/pending/hwclock.c b/toys/pending/hwclock.c
index 980d1651..d943e57a 100644
--- a/toys/pending/hwclock.c
+++ b/toys/pending/hwclock.c
@@ -4,22 +4,21 @@
*
* No Standard.
*
-USE_HWCLOCK(NEWTOY(hwclock, "f(rtc):u(utc)l(localtime)t(systz)w(systohc)s(hctosys)r(show)[!ul][!rs][!rw][!rt][!sw][!st][!wt]", TOYFLAG_USR|TOYFLAG_BIN))
+USE_HWCLOCK(NEWTOY(hwclock, ">0(fast)f(rtc):u(utc)l(localtime)t(systz)w(systohc)s(hctosys)r(show)[!ul][!rsw]", TOYFLAG_USR|TOYFLAG_BIN))
config HWCLOCK
bool "hwclock"
default n
help
- usage: hwclock [-r|--show] [-s|--hctosys] [-w|--systohc] [-t|--systz] [-l|--localtime]
- [-u|--utc] [-f|--rtc FILE]
-
- -f FILE Use specified device file (e.g. /dev/rtc2) instead of default
- -l Assume hardware clock is kept in localtime
- -r Show hardware clock time
- -s Set system time from hardware clock
- -t Set the system time based on the current timezone
- -u Assume hardware clock is kept in UTC
- -w Set hardware clock from system time
+ usage: hwclock [-rswtluf]
+
+ -f FILE Use specified device file instead of /dev/rtc (--show)
+ -l Hardware clock uses localtime (--localtime)
+ -r Show hardware clock time (--show)
+ -s Set system time from hardware clock (--hctosys)
+ -t Set the system time based on the current timezone (--systz)
+ -u Hardware clock uses UTC (--utc)
+ -w Set hardware clock from system time (--systohc)
*/
#define FOR_hwclock
#include "toys.h"
@@ -31,26 +30,25 @@ GLOBALS(
int utc;
)
-static int rtc_open(char **dev_rtc, int flag)
+static int rtc_open(int flag)
{
- if (!*dev_rtc) {
+ if (!TT.fname) {
int fd;
- if ((fd = open((*dev_rtc = "/dev/rtc"), flag)) != -1) return fd;
- else if ((fd = open((*dev_rtc = "/dev/rtc0"), flag)) != -1) return fd;
- else *dev_rtc = "/dev/misc/rtc";
+ if ((fd = open((TT.fname = "/dev/rtc"), flag)) != -1) return fd;
+ else if ((fd = open((TT.fname = "/dev/rtc0"), flag)) != -1) return fd;
+ else TT.fname = "/dev/misc/rtc";
}
- return xopen(*dev_rtc, flag);
+ return xopen(TT.fname, flag);
}
static time_t get_rtc()
{
struct tm time;
time_t tm;
- char *ptz_old = NULL;
- int fd = rtc_open(&TT.fname, O_RDONLY);
+ char *ptz_old = 0;
+ int fd = rtc_open(O_RDONLY);
- memset(&time, 0, sizeof(time));
xioctl(fd, RTC_RD_TIME, &time);
close(fd);
if (TT.utc) {
@@ -83,11 +81,11 @@ static void set_hwclock_from_sysclock()
{
struct timeval tmval;
struct tm time;
- int fd = rtc_open(&TT.fname, O_WRONLY);
+ int fd = rtc_open(O_WRONLY);
if (gettimeofday(&tmval, NULL) < 0) perror_exit("gettimeofday");
// converting a time value to broken-down UTC time
- if (TT. utc && !gmtime_r((time_t*)&tmval.tv_sec, &time))
+ if (TT.utc && !gmtime_r((time_t*)&tmval.tv_sec, &time))
error_exit("gmtime_r failed");
// converting a time value to a broken-down localtime
else if (!(localtime_r((time_t*)&tmval.tv_sec, &time)))
@@ -118,43 +116,41 @@ static void set_sysclock_timezone()
if (settimeofday(&tmval, &tmzone) < 0) perror_exit("settimeofday");
}
-static void rtc_adjtime()
+void hwclock_main()
{
- char *line = NULL;
- int fd = open("/etc/adjtime", O_RDONLY);
-
- if (fd != -1) {
- for (; (line = get_line(fd)); free(line)) {
- if (!strncmp(line, "UTC", 3)) {
- TT.utc = 1;
- break;
+ // check for UTC
+ if (!(toys.optflags & FLAG_u)) {
+ FILE *fp = fopen("/etc/adjtime", "r");
+
+ if (fp) {
+ char *line = NULL;
+ size_t st;
+
+ while (0 < getline(&line, &st, fp)) {
+ if (!strncmp(line, "UTC", 3)) {
+ TT.utc = 1;
+ break;
+ }
+ free(line);
}
+ fclose(fp);
}
- close(fd);
- }
-}
+ } else TT.utc = 1;
-static void display_hwclock()
-{
- time_t tm = get_rtc();
- char *s, *pctm = ctime(&tm);
-
- if (pctm) {
- if ((s = strrchr(pctm, '\n'))) *s = '\0';
- xprintf("%s 0.000000 seconds\n", pctm);
- } else error_exit("failed to convert a time value to a date & time string");
-}
-
-void hwclock_main()
-{
- (!(toys.optflags & FLAG_u)) ? rtc_adjtime() : (TT.utc = 1); // check for UTC
if (toys.optflags & FLAG_w) set_hwclock_from_sysclock();
else if (toys.optflags & FLAG_s) set_sysclock_from_hwclock();
else if (toys.optflags & FLAG_t) set_sysclock_timezone();
else if ((toys.optflags & FLAG_r) || (toys.optflags & FLAG_l)
- || !*toys.optargs) display_hwclock();
- else {
- toys.exithelp++;
- error_exit("invalid option '%s'", *toys.optargs);
+ || !*toys.optargs)
+ {
+ time_t tm = get_rtc();
+ char *s, *pctm = ctime(&tm);
+
+ // ctime() is defined as equivalent to asctime(localtime(t)),
+ // which is defined to overflow its buffer rather than return NULL.
+ // if (!pctm) error_exit("can't happen");
+ if ((s = strrchr(pctm, '\n'))) *s = '\0';
+ // TODO: implement this.
+ xprintf("%s 0.000000 seconds\n", pctm);
}
}