mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-16 17:37:30 +02:00
1edb432c06
Not all libcs have support for tm_gmtoff which is only available for BSD compatibility, and guarded with __USE_BSD defines, use __tm_gmtoff otherwise. Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34307 3c298f89-4303-0410-b956-a3cf2f4a3e73
89 lines
2.6 KiB
Diff
89 lines
2.6 KiB
Diff
diff -urN busybox-1.19.4/coreutils/date.c busybox-1.19.4.new/coreutils/date.c
|
|
--- busybox-1.19.4/coreutils/date.c 2012-02-04 20:24:55.000000000 +0100
|
|
+++ busybox-1.19.4.new/coreutils/date.c 2012-11-23 16:48:21.945200539 +0100
|
|
@@ -123,6 +123,7 @@
|
|
//usage: IF_FEATURE_DATE_ISOFMT(
|
|
//usage: "\n -D FMT Use FMT for -d TIME conversion"
|
|
//usage: )
|
|
+//usage: "\n -k Set Kernel timezone from localtime and exit"
|
|
//usage: "\n"
|
|
//usage: "\nRecognized TIME formats:"
|
|
//usage: "\n hh:mm[:ss]"
|
|
@@ -135,6 +136,7 @@
|
|
//usage: "Wed Apr 12 18:52:41 MDT 2000\n"
|
|
|
|
#include "libbb.h"
|
|
+#include <sys/time.h>
|
|
#if ENABLE_FEATURE_DATE_NANO
|
|
# include <sys/syscall.h>
|
|
#endif
|
|
@@ -145,8 +147,9 @@
|
|
OPT_UTC = (1 << 2), /* u */
|
|
OPT_DATE = (1 << 3), /* d */
|
|
OPT_REFERENCE = (1 << 4), /* r */
|
|
- OPT_TIMESPEC = (1 << 5) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
|
|
- OPT_HINT = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
|
|
+ OPT_KERNELTZ = (1 << 5), /* k */
|
|
+ OPT_TIMESPEC = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* I */
|
|
+ OPT_HINT = (1 << 7) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
|
|
};
|
|
|
|
static void maybe_set_utc(int opt)
|
|
@@ -164,12 +167,15 @@
|
|
/* "universal\0" No_argument "u" */
|
|
"date\0" Required_argument "d"
|
|
"reference\0" Required_argument "r"
|
|
+ "set-kernel-tz\0" No_argument "k"
|
|
;
|
|
#endif
|
|
|
|
int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int date_main(int argc UNUSED_PARAM, char **argv)
|
|
{
|
|
+ time_t tt;
|
|
+ struct timezone tz;
|
|
struct timespec ts;
|
|
struct tm tm_time;
|
|
char buf_fmt_dt2str[64];
|
|
@@ -184,7 +190,7 @@
|
|
opt_complementary = "d--s:s--d"
|
|
IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
|
|
IF_LONG_OPTS(applet_long_options = date_longopts;)
|
|
- opt = getopt32(argv, "Rs:ud:r:"
|
|
+ opt = getopt32(argv, "Rs:ud:r:k"
|
|
IF_FEATURE_DATE_ISOFMT("I::D:"),
|
|
&date_str, &date_str, &filename
|
|
IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
|
|
@@ -241,6 +247,31 @@
|
|
if (*argv)
|
|
bb_show_usage();
|
|
|
|
+ /* Setting of kernel timezone was requested */
|
|
+ if (opt & OPT_KERNELTZ) {
|
|
+ tt = time(NULL);
|
|
+ localtime_r(&tt, &tm_time);
|
|
+
|
|
+ /* workaround warp_clock() on first invocation */
|
|
+ memset(&tz, 0, sizeof(tz));
|
|
+ settimeofday(NULL, &tz);
|
|
+
|
|
+ memset(&tz, 0, sizeof(tz));
|
|
+#ifdef __USE_BSD
|
|
+ tz.tz_minuteswest = -(tm_time.tm_gmtoff / 60);
|
|
+#else
|
|
+ tz.tz_minuteswest = -(tm_time.__tm_gmtoff / 60);
|
|
+#endif
|
|
+
|
|
+ if (settimeofday(NULL, &tz))
|
|
+ {
|
|
+ bb_perror_msg("can't set kernel time zone");
|
|
+ return EXIT_FAILURE;
|
|
+ }
|
|
+
|
|
+ return EXIT_SUCCESS;
|
|
+ }
|
|
+
|
|
/* Now we have parsed all the information except the date format
|
|
* which depends on whether the clock is being set or read */
|
|
|