688a7e3f0
Bartosz Golaszewski
2013-07-25
Subject
date: accept 'yyyy-mm-dd HH' and 'yyyy-mm-dd' date formats
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/time.c+23 -10
| @@ -23,14 +23,16 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) | |
| if (sscanf(date_str, "%u:%u%c", | |
| &ptm->tm_hour, | |
| &ptm->tm_min, | |
| - | &end) >= 2) { |
| + | &end) >= 2 |
| + | ) { |
| /* no adjustments needed */ | |
| } else | |
| /* mm.dd-HH:MM */ | |
| if (sscanf(date_str, "%u.%u-%u:%u%c", | |
| &ptm->tm_mon, &ptm->tm_mday, | |
| &ptm->tm_hour, &ptm->tm_min, | |
| - | &end) >= 4) { |
| + | &end) >= 4 |
| + | ) { |
| /* Adjust month from 1-12 to 0-11 */ | |
| ptm->tm_mon -= 1; | |
| } else | |
| @@ -38,15 +40,13 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) | |
| if (sscanf(date_str, "%u.%u.%u-%u:%u%c", &ptm->tm_year, | |
| &ptm->tm_mon, &ptm->tm_mday, | |
| &ptm->tm_hour, &ptm->tm_min, | |
| - | &end) >= 5) { |
| - | ptm->tm_year -= 1900; /* Adjust years */ |
| - | ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ |
| - | } else |
| + | &end) >= 5 |
| /* yyyy-mm-dd HH:MM */ | |
| - | if (sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year, |
| + | || sscanf(date_str, "%u-%u-%u %u:%u%c", &ptm->tm_year, |
| &ptm->tm_mon, &ptm->tm_mday, | |
| &ptm->tm_hour, &ptm->tm_min, | |
| - | &end) >= 5) { |
| + | &end) >= 5 |
| + | ) { |
| ptm->tm_year -= 1900; /* Adjust years */ | |
| ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ | |
| } else | |
| @@ -58,7 +58,6 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) | |
| return; /* don't fall through to end == ":" check */ | |
| } else | |
| #endif | |
| - | //TODO: coreutils 6.9 also accepts "yyyy-mm-dd HH" (no minutes) |
| { | |
| bb_error_msg_and_die(bb_msg_invalid_date, date_str); | |
| } | |
| @@ -68,7 +67,21 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) | |
| end = '\0'; | |
| /* else end != NUL and we error out */ | |
| } | |
| - | } else if (date_str[0] == '@') { |
| + | } else |
| + | /* yyyy-mm-dd HH */ |
| + | if (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, |
| + | &ptm->tm_mon, &ptm->tm_mday, |
| + | &ptm->tm_hour, |
| + | &end) >= 4 |
| + | /* yyyy-mm-dd */ |
| + | || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, |
| + | &ptm->tm_mon, &ptm->tm_mday, |
| + | &end) >= 3 |
| + | ) { |
| + | ptm->tm_year -= 1900; /* Adjust years */ |
| + | ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ |
| + | } else |
| + | if (date_str[0] == '@') { |
| time_t t = bb_strtol(date_str + 1, NULL, 10); | |
| if (!errno) { | |
| struct tm *lt = localtime(&t); | |