Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/coreutils/date.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/coreutils/date.c (modified) (6 diffs)

branches/3.2/mindi-busybox/coreutils/date.c

@@ -20 +20 @@
    much as possible, missed out a lot of bounds checking */
 
-//applet:IF_DATE(APPLET(date, _BB_DIR_BIN, _BB_SUID_DROP))
+//applet:IF_DATE(APPLET(date, BB_DIR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_DATE) += date.o
@@ -43 +43 @@
 //config:   bool "Support %[num]N nanosecond format specifier"
 //config:   default n
-//config:   depends on DATE && PLATFORM_LINUX # syscall(__NR_clock_gettime)
+//config:   depends on DATE  # syscall(__NR_clock_gettime)
+//config:   select PLATFORM_LINUX
 //config:   help
 //config:     Support %[num]N format specifier. Adds ~250 bytes of code.
@@ -98 +99 @@
 //usage:#define date_full_usage "\n\n"
 //usage:       "Display time (using +FMT), or set time\n"
-//usage:     "\nOptions:"
 //usage:    IF_NOT_LONG_OPTS(
 //usage:     "\n    [-s] TIME   Set time to TIME"
@@ -130 +130 @@
 //usage:     "\n    YYYY-MM-DD hh:mm[:ss]"
 //usage:     "\n    [[[[[YY]YY]MM]DD]hh]mm[.ss]"
+//usage:    IF_FEATURE_DATE_COMPAT(
+//usage:     "\n    'date TIME' form accepts MMDDhhmm[[YY]YY][.ss] instead"
+//usage:    )
 //usage:
 //usage:#define date_example_usage
@@ -251 +254 @@
 #if ENABLE_FEATURE_DATE_NANO
         ts.tv_nsec = statbuf.st_mtim.tv_nsec;
-        /* some toolchains use .st_mtimensec instead of st_mtim.tv_nsec */
+        /* Some toolchains use .st_mtimensec instead of st_mtim.tv_nsec.
+         * If you need #define _SVID_SOURCE 1 to enable st_mtim.tv_nsec,
+         * drop a mail to project mailing list please
+         */
 #endif
     } else {
@@ -280 +286 @@
 
         /* Correct any day of week and day of year etc. fields */
-        tm_time.tm_isdst = -1;  /* Be sure to recheck dst */
+        /* Be sure to recheck dst (but not if date is time_t format) */
+        if (date_str[0] != '@')
+            tm_time.tm_isdst = -1;
         ts.tv_sec = validate_tm_time(date_str, &tm_time);