22542eca18
function old new delta vgetopt32 1318 1392 +74 runsvdir_main 703 713 +10 bb_make_directory 423 425 +2 collect_cpu 546 545 -1 opt_chars 3 - -3 opt_complementary 4 - -4 tftpd_main 567 562 -5 ntp_init 476 471 -5 zcip_main 1266 1256 -10 xxd_main 428 418 -10 whois_main 140 130 -10 who_main 463 453 -10 which_main 212 202 -10 wget_main 2535 2525 -10 watchdog_main 291 281 -10 watch_main 222 212 -10 vlock_main 399 389 -10 uuencode_main 332 322 -10 uudecode_main 316 306 -10 unlink_main 45 35 -10 udhcpd_main 1482 1472 -10 udhcpc_main 2762 2752 -10 tune2fs_main 290 280 -10 tunctl_main 366 356 -10 truncate_main 218 208 -10 tr_main 518 508 -10 time_main 1134 1124 -10 tftp_main 286 276 -10 telnetd_main 1873 1863 -10 tcpudpsvd_main 1785 1775 -10 taskset_main 521 511 -10 tar_main 1009 999 -10 tail_main 1644 1634 -10 syslogd_main 1967 1957 -10 switch_root_main 368 358 -10 svlogd_main 1454 1444 -10 sv 1296 1286 -10 stat_main 104 94 -10 start_stop_daemon_main 1028 1018 -10 split_main 542 532 -10 sort_main 796 786 -10 slattach_main 624 614 -10 shuf_main 504 494 -10 setsid_main 96 86 -10 setserial_main 1132 1122 -10 setfont_main 388 378 -10 setconsole_main 78 68 -10 sendmail_main 1209 1199 -10 sed_main 677 667 -10 script_main 1077 1067 -10 run_parts_main 325 315 -10 rtcwake_main 454 444 -10 rm_main 175 165 -10 reformime_main 119 109 -10 readlink_main 123 113 -10 rdate_main 246 236 -10 pwdx_main 189 179 -10 pstree_main 317 307 -10 pscan_main 663 653 -10 popmaildir_main 818 808 -10 pmap_main 80 70 -10 nc_main 1042 1032 -10 mv_main 558 548 -10 mountpoint_main 477 467 -10 mount_main 1264 1254 -10 modprobe_main 768 758 -10 modinfo_main 333 323 -10 mktemp_main 200 190 -10 mkswap_main 324 314 -10 mkfs_vfat_main 1489 1479 -10 microcom_main 715 705 -10 md5_sha1_sum_main 521 511 -10 man_main 867 857 -10 makedevs_main 1052 1042 -10 ls_main 563 553 -10 losetup_main 432 422 -10 loadfont_main 89 79 -10 ln_main 524 514 -10 link_main 75 65 -10 ipcalc_main 544 534 -10 iostat_main 2397 2387 -10 install_main 768 758 -10 id_main 480 470 -10 i2cset_main 1239 1229 -10 i2cget_main 380 370 -10 i2cdump_main 1482 1472 -10 i2cdetect_main 682 672 -10 hwclock_main 406 396 -10 httpd_main 741 731 -10 grep_main 837 827 -10 getty_main 1559 1549 -10 fuser_main 297 287 -10 ftpgetput_main 345 335 -10 ftpd_main 2232 2222 -10 fstrim_main 251 241 -10 fsfreeze_main 77 67 -10 fsck_minix_main 2921 2911 -10 flock_main 314 304 -10 flashcp_main 740 730 -10 flash_eraseall_main 833 823 -10 fdformat_main 532 522 -10 expand_main 680 670 -10 eject_main 335 325 -10 dumpleases_main 630 620 -10 du_main 314 304 -10 dos2unix_main 441 431 -10 diff_main 1350 1340 -10 df_main 1064 1054 -10 date_main 1095 1085 -10 cut_main 961 951 -10 cryptpw_main 228 218 -10 crontab_main 575 565 -10 crond_main 1149 1139 -10 cp_main 370 360 -10 common_traceroute_main 3834 3824 -10 common_ping_main 1767 1757 -10 comm_main 239 229 -10 cmp_main 655 645 -10 chrt_main 379 369 -10 chpst_main 704 694 -10 chpasswd_main 308 298 -10 chown_main 171 161 -10 chmod_main 158 148 -10 cat_main 428 418 -10 bzip2_main 120 110 -10 blkdiscard_main 264 254 -10 base64_main 221 211 -10 arping_main 1665 1655 -10 ar_main 556 546 -10 adjtimex_main 406 396 -10 adduser_main 882 872 -10 addgroup_main 411 401 -10 acpid_main 1198 1188 -10 optstring 11 - -11 opt_string 18 - -18 OPT_STR 25 - -25 ubi_tools_main 1288 1258 -30 ls_options 31 - -31 ------------------------------------------------------------------------------ (add/remove: 0/6 grow/shrink: 3/129 up/down: 86/-1383) Total: -1297 bytes text data bss dec hex filename 915428 485 6876 922789 e14a5 busybox_old 914629 485 6872 921986 e1182 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
398 lines
12 KiB
C
398 lines
12 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini date implementation for busybox
|
|
*
|
|
* by Matthew Grant <grantma@anathoth.gen.nz>
|
|
*
|
|
* 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 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
|
|
an RFC 2822 compliant date output for shell scripting
|
|
mail commands */
|
|
|
|
/* Input parsing code is always bulky - used heavy duty libc stuff as
|
|
much as possible, missed out a lot of bounds checking */
|
|
|
|
//config:config DATE
|
|
//config: bool "date (7.1 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:# defaults to "no": stat's nanosecond field is a bit non-portable
|
|
//config:config FEATURE_DATE_NANO
|
|
//config: bool "Support %[num]N nanosecond format specifier"
|
|
//config: default n
|
|
//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.
|
|
//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' is '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'
|
|
* -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
|
|
*/
|
|
|
|
//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 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_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 */
|
|
};
|
|
|
|
#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"
|
|
"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;
|
|
char buf_fmt_dt2str[64];
|
|
unsigned opt;
|
|
int ifmt = -1;
|
|
char *date_str;
|
|
char *fmt_dt2str;
|
|
char *fmt_str2dt;
|
|
char *filename;
|
|
char *isofmt_arg = NULL;
|
|
|
|
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)
|
|
);
|
|
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"; /* 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 '+' */
|
|
argv++;
|
|
}
|
|
if (!(opt & (OPT_SET | OPT_DATE))) {
|
|
opt |= OPT_SET;
|
|
date_str = argv[0]; /* can be NULL */
|
|
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 */
|
|
|
|
if (opt & OPT_REFERENCE) {
|
|
struct stat statbuf;
|
|
xstat(filename, &statbuf);
|
|
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 {
|
|
#if ENABLE_FEATURE_DATE_NANO
|
|
/* libc has incredibly messy way of doing this,
|
|
* typically requiring -lrt. We just skip all this mess */
|
|
syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
|
|
#else
|
|
time(&ts.tv_sec);
|
|
#endif
|
|
}
|
|
localtime_r(&ts.tv_sec, &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 & OPT_HINT)) {
|
|
if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
|
|
bb_error_msg_and_die(bb_msg_invalid_date, date_str);
|
|
} else {
|
|
parse_datestr(date_str, &tm_time);
|
|
}
|
|
|
|
/* Correct any day of week and day of year etc. fields */
|
|
/* 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);
|
|
|
|
maybe_set_utc(opt);
|
|
|
|
/* if setting time, set it */
|
|
if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
|
|
bb_perror_msg("can't set date");
|
|
}
|
|
}
|
|
|
|
/* Display output */
|
|
|
|
/* Deal with format string */
|
|
if (fmt_dt2str == NULL) {
|
|
int i;
|
|
fmt_dt2str = buf_fmt_dt2str;
|
|
if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
|
|
/* -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] = '\0';
|
|
} else if (opt & OPT_RFC2822) {
|
|
/* -R. undo busybox.c setlocale */
|
|
if (ENABLE_LOCALE_SUPPORT)
|
|
setlocale(LC_TIME, "C");
|
|
strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S ");
|
|
i = sizeof("%a, %d %b %Y %H:%M:%S ")-1;
|
|
goto format_utc;
|
|
} 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 (is_prefixed_with(fmt_dt2str, "%f")) {
|
|
fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
|
|
}
|
|
/* Generate output string */
|
|
strftime(date_buf, COMMON_BUFSIZE, fmt_dt2str, &tm_time);
|
|
}
|
|
puts(date_buf);
|
|
|
|
return EXIT_SUCCESS;
|
|
}
|