emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

date: introduce FEATURE_DATE_COMPAT; shrink

Browse Source 
function                                             old     new   delta
date_main                                            889     862     -27

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-01-23 23:37:52 +01:00
parent dfd38a480b
commit 5da9f96ad8
2 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
coreutils/Config.in
View File

@ -115,6 +115,22 @@ config FEATURE_DATE_ISOFMT
Enable option (-I) to output an ISO-8601 compliant Enable option (-I) to output an ISO-8601 compliant
date/time string. date/time string.
config FEATURE_DATE_COMPAT
bool "Support weird 'date MMDDhhmm[[YY]YY][.ss]' format"
default y
depends on DATE
help
System time can be set by 'date -s DATE' and simply 'date DATE',
but formats of DATE string are different. 'date DATE' accepts
a rather weird MMDDhhmm[[YY]YY][.ss] format with completely
unnatural placement of year between minutes and seconds.
date -s (and other commands like touch -d) use more sensible
formats (for one, ISO format YYYY-MM-DD hh:mm:ss.ssssss).
With this option off, 'date DATE' is 'date -s DATE' support
the same format. With it on, 'date DATE' additionally supports
MMDDhhmm[[YY]YY][.ss] format.
config DD config DD
bool "dd" bool "dd"
default n default n

59
coreutils/date.c
View File

@ -71,12 +71,12 @@ static void maybe_set_utc(int opt)
#if ENABLE_LONG_OPTS #if ENABLE_LONG_OPTS
static const char date_longopts[] ALIGN1 = static const char date_longopts[] ALIGN1 =
"rfc-822\0" No_argument "R" "rfc-822\0" No_argument "R"
"rfc-2822\0" No_argument "R" "rfc-2822\0" No_argument "R"
"set\0" Required_argument "s" "set\0" Required_argument "s"
"utc\0" No_argument "u" "utc\0" No_argument "u"
/*"universal\0" No_argument "u"*/ /* "universal\0" No_argument "u" */
"date\0" Required_argument "d" "date\0" Required_argument "d"
"reference\0" Required_argument "r" "reference\0" Required_argument "r"
; ;
#endif #endif
@ -85,6 +85,7 @@ int date_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int date_main(int argc UNUSED_PARAM, char **argv) int date_main(int argc UNUSED_PARAM, char **argv)
{ {
struct tm tm_time; struct tm tm_time;
char buf_fmt_dt2str[64];
time_t tm; time_t tm;
unsigned opt; unsigned opt;
int ifmt = -1; int ifmt = -1;
@ -108,8 +109,8 @@ int date_main(int argc UNUSED_PARAM, char **argv)
ifmt = 0; /* default is date */ ifmt = 0; /* default is date */
if (isofmt_arg) { if (isofmt_arg) {
static const char isoformats[] ALIGN1 = static const char isoformats[] ALIGN1 =
"date\0""hours\0""minutes\0""seconds\0"; "date\0""hours\0""minutes\0""seconds\0"; /* ns? */
ifmt = index_in_strings(isoformats, isofmt_arg); ifmt = index_in_substrings(isoformats, isofmt_arg);
if (ifmt < 0) if (ifmt < 0)
bb_show_usage(); bb_show_usage();
} }
@ -117,14 +118,14 @@ int date_main(int argc UNUSED_PARAM, char **argv)
fmt_dt2str = NULL; fmt_dt2str = NULL;
if (argv[0] && argv[0][0] == '+') { if (argv[0] && argv[0][0] == '+') {
fmt_dt2str = &argv[0][1]; /* Skip over the '+' */ fmt_dt2str = &argv[0][1]; /* skip over the '+' */
argv++; argv++;
} }
if (!(opt & (OPT_SET | OPT_DATE))) { if (!(opt & (OPT_SET | OPT_DATE))) {
opt |= OPT_SET; opt |= OPT_SET;
date_str = argv[0]; /* can be NULL */ date_str = argv[0]; /* can be NULL */
if (date_str) { if (date_str) {
#if ENABLE_DESKTOP #if ENABLE_FEATURE_DATE_COMPAT
int len = strspn(date_str, "0123456789"); int len = strspn(date_str, "0123456789");
if (date_str[len] == '\0' if (date_str[len] == '\0'
|| (date_str[len] == '.' || (date_str[len] == '.'
@ -133,7 +134,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
&& date_str[len+3] == '\0' && date_str[len+3] == '\0'
) )
) { ) {
/* Dreaded [MMDDhhmm[[CC]YY][.ss]] format! /* Dreaded MMDDhhmm[[CC]YY][.ss] format!
* It does not match -d or -s format. * It does not match -d or -s format.
* Some users actually do use it. * Some users actually do use it.
*/ */
@ -155,7 +156,7 @@ int date_main(int argc UNUSED_PARAM, char **argv)
bb_show_usage(); bb_show_usage();
/* Now we have parsed all the information except the date format /* 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) { if (opt & OPT_REFERENCE) {
struct stat statbuf; struct stat statbuf;
@ -198,37 +199,28 @@ int date_main(int argc UNUSED_PARAM, char **argv)
/* Deal with format string */ /* Deal with format string */
if (fmt_dt2str == NULL) { if (fmt_dt2str == NULL) {
int i; int i;
fmt_dt2str = xzalloc(32); fmt_dt2str = buf_fmt_dt2str;
if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) { if (ENABLE_FEATURE_DATE_ISOFMT && ifmt >= 0) {
strcpy(fmt_dt2str, "%Y-%m-%d"); /* -I[SPEC]: 0:date 1:hours 2:minutes 3:seconds */
if (ifmt > 0) { strcpy(fmt_dt2str, "%Y-%m-%dT%H:%M:%S");
i = 8; i = 8 + 3 * ifmt;
fmt_dt2str[i++] = 'T'; if (ifmt != 0) {
fmt_dt2str[i++] = '%'; /* TODO: if (ifmt==4) i += sprintf(&fmt_dt2str[i], ",%09u", nanoseconds); */
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';
}
}
format_utc: format_utc:
fmt_dt2str[i++] = '%'; 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) { } else if (opt & OPT_RFC2822) {
/* Undo busybox.c for date -R */ /* -R. undo busybox.c setlocale */
if (ENABLE_LOCALE_SUPPORT) if (ENABLE_LOCALE_SUPPORT)
setlocale(LC_TIME, "C"); setlocale(LC_TIME, "C");
strcpy(fmt_dt2str, "%a, %d %b %Y %H:%M:%S "); 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; goto format_utc;
} else /* default case */ } else { /* default case */
fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y"; fmt_dt2str = (char*)"%a %b %e %H:%M:%S %Z %Y";
}
} }
#define date_buf bb_common_bufsiz1 #define date_buf bb_common_bufsiz1
@ -240,7 +232,6 @@ int date_main(int argc UNUSED_PARAM, char **argv)
if (strncmp(fmt_dt2str, "%f", 2) == 0) { if (strncmp(fmt_dt2str, "%f", 2) == 0) {
fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S"; fmt_dt2str = (char*)"%Y.%m.%d-%H:%M:%S";
} }
/* Generate output string */ /* Generate output string */
strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time); strftime(date_buf, sizeof(date_buf), fmt_dt2str, &tm_time);
} }