This series aims to extend support for ISO-8601 datetime format to allow compact version, and fractional part of ISO-8601. Changes from v2: * Add example for fractional parts of second in documentation * Add/Fix regression test on 12:34:56.7.days.ago Đoàn Trần Công Danh (2): date.c: skip fractional second part of ISO-8601 date.c: allow compact version of ISO-8601 datetime Documentation/date-formats.txt | 5 ++++- date.c | 32 +++++++++++++++++++++++++++++++- t/t0006-date.sh | 6 ++++++ 3 files changed, 41 insertions(+), 2 deletions(-) Range-diff against v2: 1: 03f3e9968b ! 1: c6d42785bb date.c: skip fractional second part of ISO-8601 @@ Documentation/date-formats.txt: RFC 2822:: Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the - `T` character as well. -+ `T` character as well. The fractional part will be ignored. ++ `T` character as well. Fractional parts of a second will be ignored, ++ for example `2005-04-07T22:13:13.019` will be treated as ++ `2005-04-07T22:13:13` ++ + NOTE: In addition, the date part is accepted in the following formats: `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`. ## date.c ## @@ date.c: static int match_multi_number(timestamp_t num, char c, const char *date, + /* Time? Date? */ + switch (c) { case ':': - if (num3 < 0) +- if (num3 < 0) ++ if (num3 < 0) { num3 = 0; -+ else if (*end == '.' && isdigit(end[1])) ++ } else if (*end == '.' && isdigit(end[1]) && ++ tm->tm_year != -1 && tm->tm_mon != -1 && ++ tm->tm_mday != -1) { ++ /* Attempt to guess meaning of <num> in HHMMSS.<num> ++ * only interpret as fractional when %Y %m %d is known. ++ */ + strtol(end + 1, &end, 10); ++ } if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { tm->tm_hour = num; tm->tm_min = num2; @@ t/t0006-date.sh: check_parse 2008-02 bad check_parse '2008-02-14 20:30:45 -0015' '2008-02-14 20:30:45 -0015' check_parse '2008-02-14 20:30:45 -5' '2008-02-14 20:30:45 +0000' check_parse '2008-02-14 20:30:45 -5:' '2008-02-14 20:30:45 +0000' +@@ t/t0006-date.sh: check_approxidate 5.seconds.ago '2009-08-30 19:19:55' + check_approxidate 10.minutes.ago '2009-08-30 19:10:00' + check_approxidate yesterday '2009-08-29 19:20:00' + check_approxidate 3.days.ago '2009-08-27 19:20:00' ++check_approxidate '12:34:56.3.days.ago' '2009-08-27 12:34:56' + check_approxidate 3.weeks.ago '2009-08-09 19:20:00' + check_approxidate 3.months.ago '2009-05-30 19:20:00' + check_approxidate 2.years.3.months.ago '2007-05-30 19:20:00' 2: 36517af872 = 2: 225b6401bd date.c: allow compact version of ISO-8601 datetime -- 2.26.2.303.gf8c07b1a78