diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-19 17:31:59 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-05-31 02:50:54 +0200 |
| commit | b684d1b1864ba9d7968de5565823f8e42f1dc448 (patch) | |
| tree | f2e72a858793948363809edd10791bc00e278d96 | |
| parent | 8e95068c7f28fe2a1e31b01636e3ed29eed09ef8 (diff) | |
| download | busybox-w32-b684d1b1864ba9d7968de5565823f8e42f1dc448.tar.gz busybox-w32-b684d1b1864ba9d7968de5565823f8e42f1dc448.tar.bz2 busybox-w32-b684d1b1864ba9d7968de5565823f8e42f1dc448.zip | |
libbb: fix time parsing of [[CC]YY]MMDDhhmm[.SS]. Closes 8951
If SS is not given a value, it is assumed to be zero.
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/touch.html
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libbb/time.c b/libbb/time.c index aa19a47d4..82e6cb172 100644 --- a/libbb/time.c +++ b/libbb/time.c | |||
| @@ -186,6 +186,7 @@ void FAST_FUNC parse_datestr(const char *date_str, struct tm *ptm) | |||
| 186 | } else { | 186 | } else { |
| 187 | bb_error_msg_and_die(bb_msg_invalid_date, date_str); | 187 | bb_error_msg_and_die(bb_msg_invalid_date, date_str); |
| 188 | } | 188 | } |
| 189 | ptm->tm_sec = 0; /* assume zero if [.SS] is not given */ | ||
| 189 | if (end == '.') { | 190 | if (end == '.') { |
| 190 | /* xxx.SS */ | 191 | /* xxx.SS */ |
| 191 | if (sscanf(strchr(date_str, '.') + 1, "%u%c", | 192 | if (sscanf(strchr(date_str, '.') + 1, "%u%c", |