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

date,touch: accept Jan 7 00:00:00 2010 format

Browse Source 
function                                             old     new   delta
parse_datestr                                        618     647     +29

Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Alexander Shishkin 2010-03-22 18:22:33 +01:00 committed by Denys Vlasenko
parent 6b61629397
commit 85dbf190c6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libbb/time.c
View File

@ -15,6 +15,9 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
if (last_colon != NULL) { if (last_colon != NULL) {
/* Parse input and assign appropriately to ptm */ /* Parse input and assign appropriately to ptm */
#if ENABLE_DESKTOP
const char *endp;
#endif
/* HH:MM */ /* HH:MM */
if (sscanf(date_str, "%u:%u%c", if (sscanf(date_str, "%u:%u%c",
@ -46,8 +49,17 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm)
&end) >= 5) { &end) >= 5) {
ptm->tm_year -= 1900; /* Adjust years */ ptm->tm_year -= 1900; /* Adjust years */
ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */
} else
#if ENABLE_DESKTOP /* strptime is BIG: ~1k in uclibc, ~10k in glibc */
/* month_name d HH:MM:SS YYYY. Supported by GNU date */
if ((endp = strptime(date_str, "%b %d %T %Y", ptm)) != NULL
&& *endp == '\0'
) {
return; /* don't fall through to end == ":" check */
} else
#endif
//TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes) //TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes)
} else { {
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 (end == ':') {