* iso-format handling added by Robert Griebl <griebl@gmx.de>
* bugfixes and cleanup by Bernhard Reutner-Fischer
*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
-*/
-
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
/* This 'date' command supports only 2 time setting formats,
all the GNU strftime stuff (its in libc, lets use it),
setting time using UTC and displaying it, as well as
/* Input parsing code is always bulky - used heavy duty libc stuff as
much as possible, missed out a lot of bounds checking */
-/* Default input handling to save surprising some people */
+//config:config DATE
+//config: bool "date (7 kb)"
+//config: default y
+//config: help
+//config: date is used to set the system date or display the
+//config: current time in the given format.
+//config:
+//config:config FEATURE_DATE_ISOFMT
+//config: bool "Enable ISO date format output (-I)"
+//config: default y
+//config: depends on DATE
+//config: help
+//config: Enable option (-I) to output an ISO-8601 compliant
+//config: date/time string.
+//config:
+//config:config FEATURE_DATE_NANO
+//config: bool "Support %[num]N nanosecond format specifier"
+//config: default n # stat's nanosecond field is a bit non-portable
+//config: depends on DATE
+//config: select PLATFORM_LINUX
+//config: help
+//config: Support %[num]N format specifier. Adds ~250 bytes of code.
+//config:
+//config:config FEATURE_DATE_COMPAT
+//config: bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
+//config: default y
+//config: depends on DATE
+//config: help
+//config: System time can be set by 'date -s DATE' and simply 'date DATE',
+//config: but formats of DATE string are different. 'date DATE' accepts
+//config: a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
+//config: unnatural placement of year between minutes and seconds.
+//config: date -s (and other commands like touch -d) use more sensible
+//config: formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
+//config:
+//config: With this option off, 'date DATE' and 'date -s DATE' support
+//config: the same format. With it on, 'date DATE' additionally supports
+//config: MMDDhhmm[[YY]YY][.ss] format.
+
+//applet:IF_DATE(APPLET_NOEXEC(date, date, BB_DIR_BIN, BB_SUID_DROP, date))
+/* bb_common_bufsiz1 usage here is safe wrt NOEXEC: not expecting it to be zeroed. */
+
+//kbuild:lib-$(CONFIG_DATE) += date.o
/* GNU coreutils 6.9 man page:
* date [OPTION]... [+FORMAT]
* date [-u|--utc|--universal] [MMDDhhmm[[CC]YY][.ss]]
* -d, --date=STRING
- * display time described by STRING, not `now'
+ * display time described by STRING, not 'now'
* -f, --file=DATEFILE
* like --date once for each line of DATEFILE
* -r, --reference=FILE
* and does not support -Ins
* -D FMT is a bbox extension for _input_ conversion of -d DATE
*/
+
+//usage:#define date_trivial_usage
+//usage: "[OPTIONS] [+FMT] [TIME]"
+//usage:#define date_full_usage "\n\n"
+//usage: "Display time (using +FMT), or set time\n"
+//usage: IF_NOT_LONG_OPTS(
+//usage: "\n [-s] TIME Set time to TIME"
+//usage: "\n -u Work in UTC (don't convert to local time)"
+//usage: "\n -R Output RFC-2822 compliant date string"
+//usage: ) IF_LONG_OPTS(
+//usage: "\n [-s,--set] TIME Set time to TIME"
+//usage: "\n -u,--utc Work in UTC (don't convert to local time)"
+//usage: "\n -R,--rfc-2822 Output RFC-2822 compliant date string"
+//usage: )
+//usage: IF_FEATURE_DATE_ISOFMT(
+//usage: "\n -I[SPEC] Output ISO-8601 compliant date string"
+//usage: "\n SPEC='date' (default) for date only,"
+//usage: "\n 'hours', 'minutes', or 'seconds' for date and"
+//usage: "\n time to the indicated precision"
+//usage: )
+//usage: IF_NOT_LONG_OPTS(
+//usage: "\n -r FILE Display last modification time of FILE"
+//usage: "\n -d TIME Display TIME, not 'now'"
+//usage: ) IF_LONG_OPTS(
+//usage: "\n -r,--reference FILE Display last modification time of FILE"
+//usage: "\n -d,--date TIME Display TIME, not 'now'"
+//usage: )
+//usage: IF_FEATURE_DATE_ISOFMT(
+//usage: "\n -D FMT Use FMT (strptime format) for -d TIME conversion"
+//usage: )
+//usage: "\n"
+//usage: "\nRecognized TIME formats:"
+//usage: "\n hh:mm[:ss]"
+//usage: "\n [YYYY.]MM.DD-hh:mm[:ss]"
+//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
+//usage: "$ date\n"
+//usage: "Wed Apr 12 18:52:41 MDT 2000\n"
+
#include "libbb.h"
+#include "common_bufsiz.h"
+#if ENABLE_FEATURE_DATE_NANO
+# include <sys/syscall.h>
+#endif
enum {
OPT_RFC2822 = (1 << 0), /* R */
OPT_HINT = (1 << 6) * ENABLE_FEATURE_DATE_ISOFMT, /* D */
};
-static void maybe_set_utc(int opt)
-{
- if (opt & OPT_UTC)
- putenv((char*)"TZ=UTC0");
-}
-
#if ENABLE_LONG_OPTS
static const char date_longopts[] ALIGN1 =
- "rfc-822\0" No_argument "R"
- "rfc-2822\0" No_argument "R"
- "set\0" Required_argument "s"
- "utc\0" No_argument "u"
- /*"universal\0" No_argument "u"*/
- "date\0" Required_argument "d"
+ "rfc-822\0" No_argument "R"
+ "rfc-2822\0" No_argument "R"
+ "set\0" Required_argument "s"
+ "utc\0" No_argument "u"
+ /* "universal\0" No_argument "u" */
+ "date\0" Required_argument "d"
"reference\0" Required_argument "r"
;
#endif
+/* We are a NOEXEC applet.
+ * Obstacles to NOFORK:
+ * - we change env
+ * - xasprintf result not freed
+ * - after xasprintf we use other xfuncs
+ */
+
+static void maybe_set_utc(int opt)
+{
+ if (opt & OPT_UTC)
+ putenv((char*)"TZ=UTC0");
+}
+
int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int date_main(int argc UNUSED_PARAM, char **argv)
{
+ struct timespec ts;
struct tm tm_time;
- time_t tm;
+ char buf_fmt_dt2str[64];
unsigned opt;
int ifmt = -1;
char *date_str;
char *filename;
char *isofmt_arg = NULL;
- 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:"
- IF_FEATURE_DATE_ISOFMT("I::D:"),
+ opt = getopt32long(argv, "^"
+ "Rs:ud:r:"
+ IF_FEATURE_DATE_ISOFMT("I::D:")
+ "\0"
+ "d--s:s--d"
+ IF_FEATURE_DATE_ISOFMT(":R--I:I--R"),
+ date_longopts,
&date_str, &date_str, &filename
- IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
+ IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt)
+ );
argv += optind;
+
maybe_set_utc(opt);
if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_TIMESPEC)) {
ifmt = 0; /* default is date */
if (isofmt_arg) {
static const char isoformats[] ALIGN1 =
- "date\0""hours\0""minutes\0""seconds\0";
- ifmt = index_in_strings(isoformats, isofmt_arg);
+ "date\0""hours\0""minutes\0""seconds\0"; /* ns? */
+ ifmt = index_in_substrings(isoformats, isofmt_arg);
if (ifmt < 0)
bb_show_usage();
}
fmt_dt2str = NULL;
if (argv[0] && argv[0][0] == '+') {
- fmt_dt2str = &argv[0][1]; /* Skip over the '+' */
+ fmt_dt2str = &argv[0][1]; /* skip over the '+' */
argv++;
}
if (!(opt & (OPT_SET | OPT_DATE))) {
opt |= OPT_SET;
date_str = argv[0]; /* can be NULL */
- if (date_str)
+ if (date_str) {
+#if ENABLE_FEATURE_DATE_COMPAT
+ int len = strspn(date_str, "0123456789");
+ if (date_str[len] == '\0'
+ || (date_str[len] == '.'
+ && isdigit(date_str[len+1])
+ && isdigit(date_str[len+2])
+ && date_str[len+3] == '\0'
+ )
+ ) {
+ /* Dreaded MMDDhhmm[[CC]YY][.ss] format!
+ * It does not match -d or -s format.
+ * Some users actually do use it.
+ */
+ len -= 8;
+ if (len < 0 || len > 4 || (len & 1))
+ bb_error_msg_and_die(bb_msg_invalid_date, date_str);
+ if (len != 0) { /* move YY or CCYY to front */
+ char buf[4];
+ memcpy(buf, date_str + 8, len);
+ memmove(date_str + len, date_str, 8);
+ memcpy(date_str, buf, len);
+ }
+ }
+#endif
argv++;
+ }
}
if (*argv)
bb_show_usage();
/* Now we have parsed all the information except the date format
- which depends on whether the clock is being set or read */
+ * which depends on whether the clock is being set or read */
if (opt & OPT_REFERENCE) {
struct stat statbuf;
xstat(filename, &statbuf);
- tm = statbuf.st_mtime;
+ ts.tv_sec = statbuf.st_mtime;
+#if ENABLE_FEATURE_DATE_NANO
+ ts.tv_nsec = statbuf.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 {
- time(&tm);
+#if ENABLE_FEATURE_DATE_NANO
+ clock_gettime(CLOCK_REALTIME, &ts);
+#else
+ time(&ts.tv_sec);
+#endif
}
- localtime_r(&tm, &tm_time);
+#if !ENABLE_FEATURE_DATE_NANO
+ ts.tv_nsec = 0;
+#endif
+ localtime_r(&ts.tv_sec, &tm_time);
/* If date string is given, update tm_time, and maybe set date */
if (date_str != NULL) {
}
/* Correct any day of week and day of year etc. fields */
- tm_time.tm_isdst = -1; /* Be sure to recheck dst */
- tm = validate_tm_time(date_str, &tm_time);
-
- maybe_set_utc(opt);
+ /* 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);
+ ts.tv_nsec = 0;
/* if setting time, set it */
- if ((opt & OPT_SET) && stime(&tm) < 0) {
- bb_perror_msg("cannot set date");
+ if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) {
+ bb_simple_perror_msg("can't set date");
}
}
/* Deal with format string */
if (fmt_dt2str == NULL) {
int i;
- fmt_dt2str = xzalloc(32);
+ fmt_dt2str = buf_fmt_dt2str;
if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
- strcpy(fmt_dt2str, "%Y-%m-%d");
- if (ifmt > 0) {
- i = 8;
- fmt_dt2str[i++] = 'T';
- fmt_dt2str[i++] = '%';
- fmt_dt2str[i++] = 'H';
- if (ifmt > 1) {
- fmt_dt2str[i++] = ':';
- fmt_dt2str[i++] = '%';
- fmt_dt2str[i++] = 'M';
- if (ifmt > 2) {
- fmt_dt2str[i++] = ':';
- fmt_dt2str[i++] = '%';
- fmt_dt2str[i++] = 'S';
- }
- }
+ /* -I[SPEC]: 0:date 1:hours 2:minutes 3:seconds */
+ strcpy(fmt_dt2str, "%Y-%m-%dT%H:%M:%S");
+ i = 8 + 3 * ifmt;
+ if (ifmt != 0) {
+ /* TODO: if (ifmt==4) i += sprintf(&fmt_dt2str[i], ",%09u", nanoseconds); */
format_utc:
fmt_dt2str[i++] = '%';
- fmt_dt2str[i] = (opt & OPT_UTC) ? 'Z' : 'z';
+ fmt_dt2str[i++] = (opt & OPT_UTC) ? 'Z' : 'z';
}
+ fmt_dt2str[i] = '\0';
} else if (opt & OPT_RFC2822) {
- /* Undo busybox.c for date -R */
+ /* -R. undo busybox.c setlocale */
if (ENABLE_LOCALE_SUPPORT)
setlocale(LC_TIME, "C");
strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S ");
- i = 22;
+ i = sizeof("%a, %d %b %Y %H:%M:%S ")-1;
goto format_utc;
- } else /* default case */
+ } else { /* default case */
fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
+ }
+ }
+#if ENABLE_FEATURE_DATE_NANO
+ else {
+ /* User-specified fmt_dt2str */
+ /* Search for and process "%N" */
+ char *p = fmt_dt2str;
+ while ((p = strchr(p, '%')) != NULL) {
+ int n, m;
+ unsigned pres, scale;
+
+ p++;
+ if (*p == '%') {
+ p++;
+ continue;
+ }
+ n = strspn(p, "0123456789");
+ if (p[n] != 'N') {
+ p += n;
+ continue;
+ }
+ /* We have "%[nnn]N" */
+ p[-1] = '\0';
+ p[n] = '\0';
+ scale = 1;
+ pres = 9;
+ if (n) {
+ pres = xatoi_positive(p);
+ if (pres == 0)
+ pres = 9;
+ m = 9 - pres;
+ while (--m >= 0)
+ scale *= 10;
+ }
+
+ m = p - fmt_dt2str;
+ p += n + 1;
+ fmt_dt2str = xasprintf("%s%0*u%s", fmt_dt2str, pres, (unsigned)ts.tv_nsec / scale, p);
+ p = fmt_dt2str + m;
+ }
}
+#endif
#define date_buf bb_common_bufsiz1
+ setup_common_bufsiz();
if (*fmt_dt2str == '\0') {
/* With no format string, just print a blank line */
date_buf[0] = '\0';
} else {
/* Handle special conversions */
- if (strncmp(fmt_dt2str, "%f", 2) == 0) {
+ if (is_prefixed_with(fmt_dt2str, "%f")) {
fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
}
-
/* Generate output string */
- strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
+ strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
}
puts(date_buf);
projects / oweals / busybox.git / blobdiff