* by Matthew Grant <grantma@anathoth.gen.nz>
*
* iso-format handling added by Robert Griebl <griebl@gmx.de>
- * bugfixes and cleanup by Bernhard Fischer
+ * bugfixes and cleanup by Bernhard Reutner-Fischer
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
-
/* 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
/* Default input handling to save surprising some people */
-
-#define DATE_OPT_RFC2822 0x01
-#define DATE_OPT_SET 0x02
-#define DATE_OPT_UTC 0x04
-#define DATE_OPT_DATE 0x08
-#define DATE_OPT_REFERENCE 0x10
-#define DATE_OPT_TIMESPEC 0x20
-#define DATE_OPT_HINT 0x40
+/* 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'
+ * -f, --file=DATEFILE
+ * like --date once for each line of DATEFILE
+ * -r, --reference=FILE
+ * display the last modification time of FILE
+ * -R, --rfc-2822
+ * output date and time in RFC 2822 format.
+ * Example: Mon, 07 Aug 2006 12:34:56 -0600
+ * --rfc-3339=TIMESPEC
+ * output date and time in RFC 3339 format.
+ * TIMESPEC='date', 'seconds', or 'ns'
+ * Date and time components are separated by a single space:
+ * 2006-08-07 12:34:56-06:00
+ * -s, --set=STRING
+ * set time described by STRING
+ * -u, --utc, --universal
+ * print or set Coordinated Universal Time
+ *
+ * Busybox:
+ * long options are not supported
+ * -f is not supported
+ * -I seems to roughly match --rfc-3339, but -I has _optional_ param
+ * (thus "-I seconds" doesn't work, only "-Iseconds"),
+ * and does not support -Ins
+ * -D FMT is a bbox extension for _input_ conversion of -d DATE
+ */
+#include "libbb.h"
+
+enum {
+ OPT_RFC2822 = (1 << 0), /* R */
+ OPT_SET = (1 << 1), /* s */
+ 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 */
+};
static void maybe_set_utc(int opt)
{
- if ((opt & DATE_OPT_UTC) && putenv("TZ=UTC0") != 0)
- bb_error_msg_and_die(bb_msg_memory_exhausted);
+ if (opt & OPT_UTC)
+ putenv((char*)"TZ=UTC0");
}
-int date_main(int argc, char **argv)
+int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int date_main(int argc UNUSED_PARAM, char **argv)
{
- time_t tm;
struct tm tm_time;
+ time_t tm;
unsigned opt;
int ifmt = -1;
- char *date_str = NULL;
- char *date_fmt = NULL;
- char *filename = NULL;
- char *isofmt_arg;
- char *hintfmt_arg;
-
- opt_complementary = "?:d--s:s--d"
- USE_FEATURE_DATE_ISOFMT(":R--I:I--R");
- opt = getopt32(argc, argv, "Rs:ud:r:"
- USE_FEATURE_DATE_ISOFMT("I::D:"),
- &date_str, &date_str, &filename
- USE_FEATURE_DATE_ISOFMT(, &isofmt_arg, &hintfmt_arg));
+ char *date_str;
+ char *fmt_dt2str;
+ char *fmt_str2dt;
+ char *filename;
+ char *isofmt_arg = NULL;
+
+ opt_complementary = "d--s:s--d"
+ IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
+ opt = getopt32(argv, "Rs:ud:r:"
+ IF_FEATURE_DATE_ISOFMT("I::D:"),
+ &date_str, &date_str, &filename
+ IF_FEATURE_DATE_ISOFMT(, &isofmt_arg, &fmt_str2dt));
+ argv += optind;
maybe_set_utc(opt);
- if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_TIMESPEC)) {
- if (!isofmt_arg) {
- ifmt = 0; /* default is date */
- } else {
- const char * const isoformats[] =
- {"date", "hours", "minutes", "seconds"};
-
- for (ifmt = 0; ifmt < 4; ifmt++)
- if (!strcmp(isofmt_arg, isoformats[ifmt])) {
- break;
- }
- if (ifmt == 4) /* parse error */
+ 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);
+ if (ifmt < 0)
bb_show_usage();
}
}
- /* XXX, date_fmt == NULL from this always */
- if ((date_fmt == NULL) && (optind < argc) && (argv[optind][0] == '+')) {
- date_fmt = &argv[optind][1]; /* Skip over the '+' */
- } else if (date_str == NULL) {
- opt |= DATE_OPT_SET;
- date_str = argv[optind];
+ fmt_dt2str = NULL;
+ if (argv[0] && argv[0][0] == '+') {
+ 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)
+ 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 */
- if (filename) {
+ if (opt & OPT_REFERENCE) {
struct stat statbuf;
xstat(filename, &statbuf);
tm = statbuf.st_mtime;
- } else
+ } else {
time(&tm);
- memcpy(&tm_time, localtime(&tm), sizeof(tm_time));
- /* Zero out fields - take her back to midnight! */
+ }
+ localtime_r(&tm, &tm_time);
+
+ /* If date string is given, update tm_time, and maybe set date */
if (date_str != NULL) {
+ /* Zero out fields - take her back to midnight! */
tm_time.tm_sec = 0;
tm_time.tm_min = 0;
tm_time.tm_hour = 0;
/* Process any date input to UNIX time since 1 Jan 1970 */
- if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {
- strptime(date_str, hintfmt_arg, &tm_time);
- } else if (strchr(date_str, ':') != NULL) {
- /* Parse input and assign appropriately to tm_time */
-
- if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min,
- &tm_time.tm_sec) == 3) {
- /* no adjustments needed */
- } else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour,
- &tm_time.tm_min) == 2) {
- /* no adjustments needed */
- } else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon,
- &tm_time.tm_mday, &tm_time.tm_hour,
- &tm_time.tm_min, &tm_time.tm_sec) == 5) {
- /* Adjust dates from 1-12 to 0-11 */
- tm_time.tm_mon -= 1;
- } else if (sscanf(date_str, "%d.%d-%d:%d", &tm_time.tm_mon,
- &tm_time.tm_mday,
- &tm_time.tm_hour, &tm_time.tm_min) == 4) {
- /* Adjust dates from 1-12 to 0-11 */
- tm_time.tm_mon -= 1;
- } else if (sscanf(date_str, "%d.%d.%d-%d:%d:%d", &tm_time.tm_year,
- &tm_time.tm_mon, &tm_time.tm_mday,
- &tm_time.tm_hour, &tm_time.tm_min,
- &tm_time.tm_sec) == 6) {
- tm_time.tm_year -= 1900; /* Adjust years */
- tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
- } else if (sscanf(date_str, "%d.%d.%d-%d:%d", &tm_time.tm_year,
- &tm_time.tm_mon, &tm_time.tm_mday,
- &tm_time.tm_hour, &tm_time.tm_min) == 5) {
- tm_time.tm_year -= 1900; /* Adjust years */
- tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
- } else {
+ if (ENABLE_FEATURE_DATE_ISOFMT && (opt & OPT_HINT)) {
+ if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
bb_error_msg_and_die(bb_msg_invalid_date, date_str);
- }
} else {
- int nr;
- char *cp;
-
- nr = sscanf(date_str, "%2d%2d%2d%2d%d", &tm_time.tm_mon,
- &tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,
- &tm_time.tm_year);
-
- if (nr < 4 || nr > 5) {
- bb_error_msg_and_die(bb_msg_invalid_date, date_str);
- }
-
- cp = strchr(date_str, '.');
- if (cp) {
- nr = sscanf(cp + 1, "%2d", &tm_time.tm_sec);
- if (nr != 1) {
- bb_error_msg_and_die(bb_msg_invalid_date, date_str);
- }
- }
-
- /* correct for century - minor Y2K problem here? */
- if (tm_time.tm_year >= 1900) {
- tm_time.tm_year -= 1900;
- }
- /* adjust date */
- tm_time.tm_mon -= 1;
+ parse_datestr(date_str, &tm_time);
}
/* Correct any day of week and day of year etc. fields */
- tm_time.tm_isdst = -1; /* Be sure to recheck dst. */
- tm = mktime(&tm_time);
- if (tm < 0) {
- bb_error_msg_and_die(bb_msg_invalid_date, date_str);
- }
+ tm_time.tm_isdst = -1; /* Be sure to recheck dst */
+ tm = validate_tm_time(date_str, &tm_time);
+
maybe_set_utc(opt);
/* if setting time, set it */
- if ((opt & DATE_OPT_SET) && stime(&tm) < 0) {
+ if ((opt & OPT_SET) && stime(&tm) < 0) {
bb_perror_msg("cannot set date");
}
}
/* Display output */
/* Deal with format string */
-
- if (date_fmt == NULL) {
+ if (fmt_dt2str == NULL) {
int i;
- date_fmt = xzalloc(32);
+ fmt_dt2str = xzalloc(32);
if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
- strcpy(date_fmt, "%Y-%m-%d");
+ strcpy(fmt_dt2str, "%Y-%m-%d");
if (ifmt > 0) {
i = 8;
- date_fmt[i++] = 'T';
- date_fmt[i++] = '%';
- date_fmt[i++] = 'H';
+ fmt_dt2str[i++] = 'T';
+ fmt_dt2str[i++] = '%';
+ fmt_dt2str[i++] = 'H';
if (ifmt > 1) {
- date_fmt[i++] = ':';
- date_fmt[i++] = '%';
- date_fmt[i++] = 'M';
- }
- if (ifmt > 2) {
- date_fmt[i++] = ':';
- date_fmt[i++] = '%';
- date_fmt[i++] = 'S';
+ fmt_dt2str[i++] = ':';
+ fmt_dt2str[i++] = '%';
+ fmt_dt2str[i++] = 'M';
+ if (ifmt > 2) {
+ fmt_dt2str[i++] = ':';
+ fmt_dt2str[i++] = '%';
+ fmt_dt2str[i++] = 'S';
+ }
}
-format_utc:
- date_fmt[i++] = '%';
- date_fmt[i] = (opt & DATE_OPT_UTC) ? 'Z' : 'z';
+ format_utc:
+ fmt_dt2str[i++] = '%';
+ fmt_dt2str[i] = (opt & OPT_UTC) ? 'Z' : 'z';
}
- } else if (opt & DATE_OPT_RFC2822) {
- strcpy(date_fmt, "%a, %d %b %Y %H:%M:%S ");
+ } else if (opt & OPT_RFC2822) {
+ /* Undo busybox.c for date -R */
+ if (ENABLE_LOCALE_SUPPORT)
+ setlocale(LC_TIME, "C");
+ strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S ");
i = 22;
goto format_utc;
} else /* default case */
- date_fmt = "%a %b %e %H:%M:%S %Z %Y";
+ fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
}
- if (*date_fmt == '\0') {
+#define date_buf bb_common_bufsiz1
+ if (*fmt_dt2str == '\0') {
/* With no format string, just print a blank line */
- *bb_common_bufsiz1 = 0;
+ date_buf[0] = '\0';
} else {
/* Handle special conversions */
-
- if (strncmp(date_fmt, "%f", 2) == 0) {
- date_fmt = "%Y.%m.%d-%H:%M:%S";
+ if (strncmp(fmt_dt2str, "%f", 2) == 0) {
+ fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
}
/* Generate output string */
- strftime(bb_common_bufsiz1, 200, date_fmt, &tm_time);
+ strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
}
- puts(bb_common_bufsiz1);
+ puts(date_buf);
return EXIT_SUCCESS;
}