036585a911
FEATURE_GETOPT_LONG made dependent on LONG_OPTS. The folloving options are removed, now LONG_OPTS enables long options for affected applets: FEATURE_ENV_LONG_OPTIONS FEATURE_EXPAND_LONG_OPTIONS FEATURE_UNEXPAND_LONG_OPTIONS FEATURE_MKDIR_LONG_OPTIONS FEATURE_MV_LONG_OPTIONS FEATURE_RMDIR_LONG_OPTIONS FEATURE_ADDGROUP_LONG_OPTIONS FEATURE_ADDUSER_LONG_OPTIONS FEATURE_HWCLOCK_LONG_OPTIONS FEATURE_NSENTER_LONG_OPTS FEATURE_CHCON_LONG_OPTIONS FEATURE_RUNCON_LONG_OPTIONS They either had a small number of long options, or their long options are essential. Example: upstream addgroup and adduser have ONLY longopts, we should probably go further and get rid of non-standard short options. To this end, make addgroup and adduser "select LONG_OPTS". We had this breakage caused by us even in our own package! #if ENABLE_LONG_OPTS || !ENABLE_ADDGROUP /* We try to use --gid, not -g, because "standard" addgroup * has no short option -g, it has only long --gid. */ argv[1] = (char*)"--gid"; #else /* Breaks if system in fact does NOT use busybox addgroup */ argv[1] = (char*)"-g"; #endif xargs: its lone longopt no longer depends on DESKTOP, only on LONG_OPTS. hwclock TODO: get rid of incompatible -t, -l aliases to --systz, --localtime Shorten help texts by omitting long option when short opt alternative exists. Reduction of size comes from the fact that store of an immediate (an address of longopts) to a fixed address (global variable) is a longer insn than pushing that immediate or passing it in a register. This effect is CPU-agnostic. function old new delta getopt32 1350 22 -1328 vgetopt32 - 1318 +1318 getopt32long - 24 +24 tftpd_main 562 567 +5 scan_recursive 376 380 +4 collect_cpu 545 546 +1 date_main 1096 1095 -1 hostname_main 262 259 -3 uname_main 259 255 -4 setpriv_main 362 358 -4 rmdir_main 191 187 -4 mv_main 562 558 -4 ipcalc_main 548 544 -4 ifenslave_main 641 637 -4 gzip_main 192 188 -4 gunzip_main 77 73 -4 fsfreeze_main 81 77 -4 flock_main 318 314 -4 deluser_main 337 333 -4 cp_main 374 370 -4 chown_main 175 171 -4 applet_long_options 4 - -4 xargs_main 894 889 -5 wget_main 2540 2535 -5 udhcpc_main 2767 2762 -5 touch_main 436 431 -5 tar_main 1014 1009 -5 start_stop_daemon_main 1033 1028 -5 sed_main 682 677 -5 script_main 1082 1077 -5 run_parts_main 330 325 -5 rtcwake_main 459 454 -5 od_main 2169 2164 -5 nl_main 201 196 -5 modprobe_main 773 768 -5 mkdir_main 160 155 -5 ls_main 568 563 -5 install_main 773 768 -5 hwclock_main 411 406 -5 getopt_main 622 617 -5 fstrim_main 256 251 -5 env_main 198 193 -5 dumpleases_main 635 630 -5 dpkg_main 3991 3986 -5 diff_main 1355 1350 -5 cryptpw_main 233 228 -5 cpio_main 593 588 -5 conspy_main 1135 1130 -5 chpasswd_main 313 308 -5 adduser_main 887 882 -5 addgroup_main 416 411 -5 ftpgetput_main 351 345 -6 get_terminal_width_height 242 234 -8 expand_main 690 680 -10 static.expand_longopts 18 - -18 static.unexpand_longopts 27 - -27 mkdir_longopts 28 - -28 env_longopts 30 - -30 static.ifenslave_longopts 34 - -34 mv_longopts 46 - -46 static.rmdir_longopts 48 - -48 packed_usage 31739 31687 -52 ------------------------------------------------------------------------------ (add/remove: 2/8 grow/shrink: 3/49 up/down: 1352/-1840) Total: -488 bytes text data bss dec hex filename 915681 485 6880 923046 e15a6 busybox_old 915428 485 6876 922789 e14a5 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
394 lines
12 KiB
C
394 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_complementary = "d--s:s--d"
|
|
IF_FEATURE_DATE_ISOFMT(":R--I:I--R");
|
|
opt = getopt32long(argv, "Rs:ud:r:"
|
|
IF_FEATURE_DATE_ISOFMT("I::D:"), 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;
|
|
}
|