summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-05-19 15:31:59 (GMT)
committerDenys Vlasenko <vda.linux@googlemail.com>2016-05-31 00:50:54 (GMT)
commitb684d1b1864ba9d7968de5565823f8e42f1dc448 (patch)
treef2e72a858793948363809edd10791bc00e278d96
parent8e95068c7f28fe2a1e31b01636e3ed29eed09ef8 (diff)
downloadbusybox-refs/heads/master.tar.gz
busybox-refs/heads/master.tar.bz2
libbb: fix time parsing of [[CC]YY]MMDDhhmm[.SS]. Closes 8951HEADmaster
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libbb/time.c b/libbb/time.c
index aa19a47..82e6cb1 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)
} else {
bb_error_msg_and_die(bb_msg_invalid_date, date_str);
}
+ ptm->tm_sec = 0; /* assume zero if [.SS] is not given */
if (end == '.') {
/* xxx.SS */
if (sscanf(strchr(date_str, '.') + 1, "%u%c",