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

date: make it accept ISO date format. Fix help text.

Browse Source 
make testsuite actually test something useful.

function                                             old     new   delta
date_main                                           1094    1149     +55
This commit is contained in:
Denis Vlasenko 2008-04-25 02:14:07 +00:00
parent ad6cab1834
commit 4d89a8bd1d
3 changed files with 98 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
coreutils/date.c
View File

@ -103,67 +103,67 @@ int date_main(int argc ATTRIBUTE_UNUSED, char **argv)
if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) { if (ENABLE_FEATURE_DATE_ISOFMT && (opt & DATE_OPT_HINT)) {
if (strptime(date_str, fmt_str2dt, &tm_time) == NULL) if (strptime(date_str, fmt_str2dt, &tm_time) == NULL)
bb_error_msg_and_die(bb_msg_invalid_date, date_str); bb_error_msg_and_die(bb_msg_invalid_date, date_str);
} else if (strchr(date_str, ':') != NULL) { } else {
/* Parse input and assign appropriately to tm_time */ char end = '\0';
const char *last_colon = strrchr(date_str, ':');
if (sscanf(date_str, "%d:%d:%d", &tm_time.tm_hour, &tm_time.tm_min, if (last_colon != NULL) {
&tm_time.tm_sec) == 3) { /* Parse input and assign appropriately to tm_time */
/* no adjustments needed */
} else if (sscanf(date_str, "%d:%d", &tm_time.tm_hour, if (sscanf(date_str, "%u:%u%c",
&tm_time.tm_min) == 2) { &tm_time.tm_hour,
/* no adjustments needed */ &tm_time.tm_min,
} else if (sscanf(date_str, "%d.%d-%d:%d:%d", &tm_time.tm_mon, &end) >= 2) {
&tm_time.tm_mday, &tm_time.tm_hour, /* no adjustments needed */
&tm_time.tm_min, &tm_time.tm_sec) == 5) { } else if (sscanf(date_str, "%u.%u-%u:%u%c",
/* 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_mon, &tm_time.tm_mday,
&tm_time.tm_hour, &tm_time.tm_min, &tm_time.tm_hour, &tm_time.tm_min,
&tm_time.tm_sec) == 6) { &end) >= 4) {
tm_time.tm_year -= 1900; /* Adjust years */ /* Adjust dates from 1-12 to 0-11 */
tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ tm_time.tm_mon -= 1;
} else if (sscanf(date_str, "%d.%d.%d-%d:%d", &tm_time.tm_year, } else if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &tm_time.tm_year,
&tm_time.tm_mon, &tm_time.tm_mday, &tm_time.tm_mon, &tm_time.tm_mday,
&tm_time.tm_hour, &tm_time.tm_min) == 5) { &tm_time.tm_hour, &tm_time.tm_min,
tm_time.tm_year -= 1900; /* Adjust years */ &end) >= 5) {
tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */ tm_time.tm_year -= 1900; /* Adjust years */
} else { tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
bb_error_msg_and_die(bb_msg_invalid_date, date_str); } else if (sscanf(date_str, "%u-%u-%u %u:%u%c", &tm_time.tm_year,
} &tm_time.tm_mon, &tm_time.tm_mday,
} else { &tm_time.tm_hour, &tm_time.tm_min,
int nr; &end) >= 5) {
char *cp; tm_time.tm_year -= 1900; /* Adjust years */
tm_time.tm_mon -= 1; /* Adjust dates from 1-12 to 0-11 */
nr = sscanf(date_str, "%2d%2d%2d%2d%d", &tm_time.tm_mon, //TODO: coreutils 6.9 also accepts "YYYY-MM-DD HH" (no minutes)
&tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min, } else {
&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); bb_error_msg_and_die(bb_msg_invalid_date, date_str);
} }
if (end == ':') {
if (sscanf(last_colon + 1, "%u%c", &tm_time.tm_sec, &end) == 1)
end = '\0';
/* else end != NUL and we error out */
}
} else {
if (sscanf(date_str, "%2u%2u%2u%2u%u%c", &tm_time.tm_mon,
&tm_time.tm_mday, &tm_time.tm_hour, &tm_time.tm_min,
&tm_time.tm_year, &end) < 4)
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;
if (end == '.') {
if (sscanf(strchr(date_str, '.') + 1, "%u%c",
&tm_time.tm_sec, &end) == 1)
end = '\0';
/* else end != NUL and we error out */
}
} }
if (end != '\0') {
/* correct for century - minor Y2K problem here? */ bb_error_msg_and_die(bb_msg_invalid_date, date_str);
if (tm_time.tm_year >= 1900) {
tm_time.tm_year -= 1900;
} }
/* adjust date */
tm_time.tm_mon -= 1;
} }
/* Correct any day of week and day of year etc. fields */ /* Correct any day of week and day of year etc. fields */
tm_time.tm_isdst = -1; /* Be sure to recheck dst. */ tm_time.tm_isdst = -1; /* Be sure to recheck dst. */
tm = mktime(&tm_time); tm = mktime(&tm_time);

3
include/usage.h
View File

@ -612,8 +612,9 @@
) \ ) \
"\n" \ "\n" \
"\nRecognized formats for TIME:" \ "\nRecognized formats for TIME:" \
"\n [hh:]mm:ss" \ "\n hh:mm[:ss]" \
"\n [YYYY.]MM.DD-hh:mm[:ss]" \ "\n [YYYY.]MM.DD-hh:mm[:ss]" \
"\n YYYY-MM-DD hh:mm[:ss]" \
"\n MMDDhhmm[[YY]YY][.ss]" \ "\n MMDDhhmm[[YY]YY][.ss]" \
#define date_example_usage \ #define date_example_usage \

45
testsuite/date/date-works
View File

@ -1 +1,44 @@
test x"`date`" = x"`busybox date`" dt=`busybox date`
# Expected format: Fri Apr 25 03:47:55 CEST 2008
dt=`echo "$dt" | sed 's/^[^ ][^ ][^ ] [^ ][^ ][^ ] [ 0123][0-9] [012][0-9]:[0-5][0-9]:[0-6][0-9] [A-Z][A-Z]* [012][0-9][0-9][0-9]$/OK/'`
test x"$dt" = x"OK"
dt=`busybox date -d 1:2`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Fri Apr 25 01:02:00"
dt=`busybox date -d 1:2:3`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Fri Apr 25 01:02:03"
dt=`busybox date -d 1.2-3:4`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Wed Jan 2 03:04:00"
dt=`busybox date -d 1.2-3:4:5`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Wed Jan 2 03:04:05"
dt=`busybox date -d 1999.1.2-3:4`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Sat Jan 2 03:04:00"
dt=`busybox date -d 1999.1.2-3:4:5`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Sat Jan 2 03:04:05"
dt=`busybox date -d '1999-1-2 3:4:5'`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Sat Jan 2 03:04:05"
dt=`busybox date -d 01231133`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Wed Jan 23 11:33:00"
dt=`busybox date -d 012311332000`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Sun Jan 23 11:33:00"
dt=`busybox date -d 012311332000.30`
dt=`echo "$dt" | cut -b1-19`
test x"$dt" = x"Sun Jan 23 11:33:30"