diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-15 04:55:40 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-11-15 04:55:40 +0100 |
| commit | ff1822aed159e1c1b5a92dc5c1fd1648b026f8f4 (patch) | |
| tree | 2dc5446a7049e666cda7053bd8c13a41a5cedf0e /libbb | |
| parent | 6e54249e05f3fbe472814465d8f3e122801b7e96 (diff) | |
| download | busybox-w32-ff1822aed159e1c1b5a92dc5c1fd1648b026f8f4.tar.gz busybox-w32-ff1822aed159e1c1b5a92dc5c1fd1648b026f8f4.tar.bz2 busybox-w32-ff1822aed159e1c1b5a92dc5c1fd1648b026f8f4.zip | |
date: restore hadling of MMDDhhmm[[CC]YY][.ss] date format
function old new delta
date_main 698 889 +191
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/time.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libbb/time.c b/libbb/time.c index b31683b67..85c72d163 100644 --- a/libbb/time.c +++ b/libbb/time.c | |||
| @@ -74,25 +74,25 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *tm_time) | |||
| 74 | int len = strchrnul(date_str, '.') - date_str; | 74 | int len = strchrnul(date_str, '.') - date_str; |
| 75 | 75 | ||
| 76 | /* MM[.SS] */ | 76 | /* MM[.SS] */ |
| 77 | if (len == 2 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 12, | 77 | if (len == 2 && sscanf(date_str, "%2u%2u%2u%2u""%2u%c" + 12, |
| 78 | &tm_time->tm_min, | 78 | &tm_time->tm_min, |
| 79 | &end) >= 1) { | 79 | &end) >= 1) { |
| 80 | } else | 80 | } else |
| 81 | /* HHMM[.SS] */ | 81 | /* HHMM[.SS] */ |
| 82 | if (len == 4 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 9, | 82 | if (len == 4 && sscanf(date_str, "%2u%2u%2u""%2u%2u%c" + 9, |
| 83 | &tm_time->tm_hour, | 83 | &tm_time->tm_hour, |
| 84 | &tm_time->tm_min, | 84 | &tm_time->tm_min, |
| 85 | &end) >= 2) { | 85 | &end) >= 2) { |
| 86 | } else | 86 | } else |
| 87 | /* ddHHMM[.SS] */ | 87 | /* ddHHMM[.SS] */ |
| 88 | if (len == 6 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 6, | 88 | if (len == 6 && sscanf(date_str, "%2u%2u""%2u%2u%2u%c" + 6, |
| 89 | &tm_time->tm_mday, | 89 | &tm_time->tm_mday, |
| 90 | &tm_time->tm_hour, | 90 | &tm_time->tm_hour, |
| 91 | &tm_time->tm_min, | 91 | &tm_time->tm_min, |
| 92 | &end) >= 3) { | 92 | &end) >= 3) { |
| 93 | } else | 93 | } else |
| 94 | /* mmddHHMM[.SS] */ | 94 | /* mmddHHMM[.SS] */ |
| 95 | if (len == 8 && sscanf(date_str, "%2u%2u%2u%2u%2u%c" + 3, | 95 | if (len == 8 && sscanf(date_str, "%2u""%2u%2u%2u%2u%c" + 3, |
| 96 | &tm_time->tm_mon, | 96 | &tm_time->tm_mon, |
| 97 | &tm_time->tm_mday, | 97 | &tm_time->tm_mday, |
| 98 | &tm_time->tm_hour, | 98 | &tm_time->tm_hour, |