* Copyright (C) 2002 Robert Griebl <griebl@gmx.de>
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
-*/
+ */
+//config:config HWCLOCK
+//config: bool "hwclock (5.8 kb)"
+//config: default y
+//config: select PLATFORM_LINUX
+//config: help
+//config: The hwclock utility is used to read and set the hardware clock
+//config: on a system. This is primarily used to set the current time on
+//config: shutdown in the hardware clock, so the hardware will keep the
+//config: correct time when Linux is _not_ running.
+//config:
+//config:config FEATURE_HWCLOCK_ADJTIME_FHS
+//config: bool "Use FHS /var/lib/hwclock/adjtime"
+//config: default n # util-linux-ng in Fedora 13 still uses /etc/adjtime
+//config: depends on HWCLOCK
+//config: help
+//config: Starting with FHS 2.3, the adjtime state file is supposed to exist
+//config: at /var/lib/hwclock/adjtime instead of /etc/adjtime. If you wish
+//config: to use the FHS behavior, answer Y here, otherwise answer N for the
+//config: classic /etc/adjtime path.
+//config:
+//config: pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
+
+//applet:IF_HWCLOCK(APPLET(hwclock, BB_DIR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_HWCLOCK) += hwclock.o
#include "libbb.h"
/* After libbb.h, since it needs sys/types.h on some systems */
while (1) {
rtc_read_tm(&tm_time, fd);
gettimeofday(sys_tv, NULL);
- if (before != tm_time.tm_sec)
+ if (before != (int)tm_time.tm_sec)
break;
}
}
#if SHOW_HWCLOCK_DIFF
struct timeval sys_tv;
#endif
- time_t t;
- char *cp;
+ time_t t = read_rtc(pp_rtcname, &sys_tv, utc);
+
+#if ENABLE_LOCALE_SUPPORT
+ /* Standard hwclock uses locale-specific output format */
+ char cp[64];
+ struct tm *ptm = localtime(&t);
+ strftime(cp, sizeof(cp), "%c", ptm);
+#else
+ char *cp = ctime(&t);
+ chomp(cp);
+#endif
- t = read_rtc(pp_rtcname, &sys_tv, utc);
- cp = ctime(&t);
- strchrnul(cp, '\n')[0] = '\0';
#if !SHOW_HWCLOCK_DIFF
printf("%s 0.000000 seconds\n", cp);
#else
{
long diff = sys_tv.tv_sec - t;
if (diff < 0 /*&& tv.tv_usec != 0*/) {
- /* Why? */
- /* diff >= 0 is ok: diff < 0, can't just use tv.tv_usec: */
- /* 45.520820 43.520820 */
- /* - 44.000000 - 45.000000 */
- /* = 1.520820 = -1.479180, not -2.520820! */
+ /* Why we need diff++? */
+ /* diff >= 0 is ok: | diff < 0, can't just use tv.tv_usec: */
+ /* 45.520820 | 43.520820 */
+ /* - 44.000000 | - 45.000000 */
+ /* = 1.520820 | = -1.479180, not -2.520820! */
diff++;
- /* should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
+ /* Should be 1000000 - tv.tv_usec, but then we must check tv.tv_usec != 0 */
sys_tv.tv_usec = 999999 - sys_tv.tv_usec;
}
printf("%s %ld.%06lu seconds\n", cp, diff, (unsigned long)sys_tv.tv_usec);
struct timeval tv;
struct timezone tz;
- tz.tz_minuteswest = timezone/60 - 60*daylight;
+ tz.tz_minuteswest = timezone/60;
+ /* ^^^ used to also subtract 60*daylight, but it's wrong:
+ * daylight!=0 means "this timezone has some DST
+ * during the year", not "DST is in effect now".
+ */
tz.tz_dsttime = 0;
tv.tv_sec = read_rtc(pp_rtcname, NULL, utc);
* On x86, even though code does set hw clock within <1ms of exact
* whole seconds, apparently hw clock (at least on some machines)
* doesn't reset internal fractional seconds to 0,
- * making all this a pointless excercise.
+ * making all this a pointless exercise.
*/
/* If we see that we are N usec away from whole second,
* we'll sleep for N-ADJ usecs. ADJ corrects for the fact
gettimeofday(&tv, NULL);
broken = localtime(&tv.tv_sec);
tz.tz_minuteswest = timezone / 60;
- if (broken->tm_isdst)
+ if (broken->tm_isdst > 0)
tz.tz_minuteswest -= 60;
tz.tz_dsttime = 0;
gettimeofday(&tv, NULL);
}
//usage:#define hwclock_trivial_usage
-//usage: IF_FEATURE_HWCLOCK_LONG_OPTIONS(
-//usage: "[-r|--show] [-s|--hctosys] [-w|--systohc] [-t|--systz]"
-//usage: " [-l|--localtime] [-u|--utc]"
+//usage: IF_LONG_OPTS(
+//usage: "[-r|--show] [-s|--hctosys] [-w|--systohc] [--systz]"
+//usage: " [--localtime] [-u|--utc]"
//usage: " [-f|--rtc FILE]"
//usage: )
-//usage: IF_NOT_FEATURE_HWCLOCK_LONG_OPTIONS(
+//usage: IF_NOT_LONG_OPTS(
//usage: "[-r] [-s] [-w] [-t] [-l] [-u] [-f FILE]"
//usage: )
//usage:#define hwclock_full_usage "\n\n"
//usage: "\n -r Show hardware clock time"
//usage: "\n -s Set system time from hardware clock"
//usage: "\n -w Set hardware clock from system time"
-//usage: "\n -t Set in-kernel timezone, correct system time"
+//usage: IF_LONG_OPTS(
+//usage: "\n --systz Set in-kernel timezone, correct system time"
+//usage: )
//usage: "\n if hardware clock is in local time"
-//usage: "\n -u Hardware clock is in UTC"
-//usage: "\n -l Hardware clock is in local time"
+//usage: "\n -u Assume hardware clock is kept in UTC"
+//usage: IF_LONG_OPTS(
+//usage: "\n --localtime Assume hardware clock is kept in local time"
+//usage: )
//usage: "\n -f FILE Use specified device (e.g. /dev/rtc2)"
+//TODO: get rid of incompatible -t and -l aliases to --systz and --localtime
+
#define HWCLOCK_OPT_LOCALTIME 0x01
#define HWCLOCK_OPT_UTC 0x02
#define HWCLOCK_OPT_SHOW 0x04
unsigned opt;
int utc;
-#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
+#if ENABLE_LONG_OPTS
static const char hwclock_longopts[] ALIGN1 =
"localtime\0" No_argument "l" /* short opt is non-standard */
"utc\0" No_argument "u"
"systz\0" No_argument "t" /* short opt is non-standard */
"rtc\0" Required_argument "f"
;
- applet_long_options = hwclock_longopts;
#endif
- opt_complementary = "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l";
- opt = getopt32(argv, "lurswtf:", &rtcname);
+
+ /* Initialize "timezone" (libc global variable) */
+ tzset();
+
+ opt = getopt32long(argv,
+ "^lurswtf:" "\0" "r--wst:w--rst:s--wrt:t--rsw:l--u:u--l",
+ hwclock_longopts,
+ &rtcname
+ );
/* If -u or -l wasn't given check if we are using utc */
if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
projects / oweals / busybox.git / blobdiff