From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Jeff King" <peff@peff.net>,
"Torsten Bögershausen" <tboegi@web.de>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v5 0/4] More ISO-8601 support
Date: Fri, 24 Apr 2020 22:07:28 +0700 [thread overview]
Message-ID: <cover.1587740682.git.congdanhqx@gmail.com> (raw)
In-Reply-To: <cover.1586856398.git.congdanhqx@gmail.com>
This series aims to extend support for ISO-8601 datetime format
to allow compact version, and fractional part of ISO-8601.
Change in v5 from v4:
* cleanup [3/4] following Junio's suggestion.
Changes in v4 from v3:
* s/is_date/set_date/ the function's name suggest it only does validation,
but it does more than that. Junio suggested to me to use it for validation,
When I looked more into it, I think it's better to not use it, and rename
the function to reduce the confusion
* Extract the validate and set time to its own function
* Correct a check for time in compact ISO-8601
Changes in v3 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 (4):
date.c: s/is_date/set_date/
date.c: validate and set time in a helper function
date.c: skip fractional second part of ISO-8601
date.c: allow compact version of ISO-8601 datetime
Đoàn Trần Công Danh (4):
date.c: s/is_date/set_date/
date.c: validate and set time in a helper function
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 | 67 ++++++++++++++++++++++++++--------
t/t0006-date.sh | 6 +++
3 files changed, 62 insertions(+), 16 deletions(-)
Range-diff against v4:
1: 1fe69008fc = 1: 1fe69008fc date.c: s/is_date/set_date/
2: 0d0e4d8edc ! 2: a6b97b19f2 date.c: validate and set time in a helper function
@@ Commit message
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
+
+ ## Notes ##
+ I intentionally leave a pair of bracket around if (set_time(...))
+ to reduce the noise in next patch
+
## date.c ##
@@ date.c: static int set_date(int year, int month, int day, struct tm *now_tm, time_t now,
return -1;
@@ date.c: static int set_date(int year, int month, int day, struct tm *now_tm, tim
+static int set_time(long hour, long minute, long second, struct tm *tm)
+{
-+ /* C90 and old POSIX accepts 2 leap seconds, it's a defect,
-+ * ignore second number 61
-+ */
++ /* We accept 61st second because of leap second */
+ if (0 <= hour && hour <= 24 &&
+ 0 <= minute && minute < 60 &&
+ 0 <= second && second <= 60) {
@@ date.c: static int match_multi_number(timestamp_t num, char c, const char *date,
- tm->tm_hour = num;
- tm->tm_min = num2;
- tm->tm_sec = num3;
-+ if (set_time(num, num2, num3, tm) == 0)
++ if (set_time(num, num2, num3, tm) == 0) {
break;
-- }
+ }
return 0;
-
- case '-':
3: 8b18d0ee5d ! 3: f21aa2dcf5 date.c: skip fractional second part of ISO-8601
@@ Commit message
relative to current time.
Reported-by: Brian M. Carlson <sandals@crustytoothpaste.net>
+ Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
## Documentation/date-formats.txt ##
@@ Documentation/date-formats.txt: RFC 2822::
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
## date.c ##
+@@ date.c: static int set_time(long hour, long minute, long second, struct tm *tm)
+ return -1;
+ }
+
++static int is_date_known(struct tm *tm)
++{
++ return tm->tm_year != -1 && tm->tm_mon != -1 && tm->tm_mday != -1;
++}
++
+ static int match_multi_number(timestamp_t num, char c, const char *date,
+ char *end, struct tm *tm, time_t now)
+ {
@@ 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]) &&
-+ tm->tm_year != -1 && tm->tm_mon != -1 && tm->tm_mday != -1 &&
-+ set_time(num, num2, num3, tm) == 0) {
-+ /* %Y%m%d is known, ignore fractional <num4> in HHMMSS.<num4> */
-+ strtol(end + 1, &end, 10);
-+ }
- if (set_time(num, num2, num3, tm) == 0)
+ if (set_time(num, num2, num3, tm) == 0) {
++ /*
++ * If %H:%M:%S was just parsed followed by: .<num4>
++ * Consider (& discard) it as fractional second
++ * if %Y%m%d is parsed before.
++ */
++ if (*end == '.' && isdigit(end[1]) && is_date_known(tm))
++ strtol(end + 1, &end, 10);
break;
+ }
return 0;
## t/t0006-date.sh ##
4: 2812439a26 = 4: 51aa60c069 date.c: allow compact version of ISO-8601 datetime
--
2.26.2.384.g435bf60bd5
next prev parent reply other threads:[~2020-04-24 15:07 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-14 0:03 Mishandling of fractional seconds in ISO 8601 format brian m. carlson
2020-04-14 9:31 ` [PATCH 0/2] More ISO-8601 support Đoàn Trần Công Danh
2020-04-14 9:31 ` [PATCH 1/2] date.c: allow fractional second part of ISO-8601 Đoàn Trần Công Danh
2020-04-14 20:16 ` Jeff King
2020-04-15 2:15 ` Danh Doan
2020-04-14 20:17 ` Jeff King
2020-04-14 23:49 ` brian m. carlson
2020-04-15 2:17 ` Danh Doan
2020-04-14 9:31 ` [PATCH 2/2] date.c: allow compact version of ISO-8601 datetime Đoàn Trần Công Danh
2020-04-14 20:24 ` Jeff King
2020-04-15 2:12 ` Danh Doan
2020-04-15 15:03 ` Junio C Hamano
2020-04-15 15:41 ` Jeff King
2020-04-15 15:58 ` Junio C Hamano
2020-04-16 11:16 ` Danh Doan
2020-04-14 23:45 ` [PATCH 0/2] More ISO-8601 support brian m. carlson
2020-04-15 3:31 ` [PATCH v2 " Đoàn Trần Công Danh
2020-04-15 3:31 ` [PATCH v2 1/2] date.c: skip fractional second part of ISO-8601 Đoàn Trần Công Danh
2020-04-15 10:17 ` Torsten Bögershausen
2020-04-16 10:04 ` Danh Doan
2020-04-15 3:31 ` [PATCH v2 2/2] date.c: allow compact version of ISO-8601 datetime Đoàn Trần Công Danh
2020-04-22 13:15 ` [PATCH v3 0/2] More ISO-8601 support Đoàn Trần Công Danh
2020-04-22 13:15 ` [PATCH v3 1/2] date.c: skip fractional second part of ISO-8601 Đoàn Trần Công Danh
2020-04-22 17:05 ` Junio C Hamano
2020-04-23 1:18 ` Danh Doan
2020-04-23 19:28 ` Junio C Hamano
2020-04-23 20:41 ` Philip Oakley
2020-04-24 0:07 ` Danh Doan
2020-04-24 0:46 ` Junio C Hamano
2020-04-24 17:32 ` Philip Oakley
2020-04-24 17:30 ` Philip Oakley
2020-04-22 13:15 ` [PATCH v3 2/2] date.c: allow compact version of ISO-8601 datetime Đoàn Trần Công Danh
2020-04-22 17:17 ` Junio C Hamano
2020-04-23 1:20 ` Danh Doan
2020-04-23 13:52 ` [PATCH v4 0/4] More ISO-8601 support Đoàn Trần Công Danh
2020-04-23 13:52 ` [PATCH v4 1/4] date.c: s/is_date/set_date/ Đoàn Trần Công Danh
2020-04-23 20:08 ` Junio C Hamano
2020-04-23 13:52 ` [PATCH v4 2/4] date.c: validate and set time in a helper function Đoàn Trần Công Danh
2020-04-23 20:18 ` Junio C Hamano
2020-04-24 11:43 ` Danh Doan
2020-04-24 20:29 ` Junio C Hamano
2020-04-23 13:52 ` [PATCH v4 3/4] date.c: skip fractional second part of ISO-8601 Đoàn Trần Công Danh
2020-04-23 20:29 ` Junio C Hamano
2020-04-23 13:52 ` [PATCH v4 4/4] date.c: allow compact version of ISO-8601 datetime Đoàn Trần Công Danh
2020-04-24 15:07 ` Đoàn Trần Công Danh [this message]
2020-04-24 15:07 ` [PATCH v5 1/4] date.c: s/is_date/set_date/ Đoàn Trần Công Danh
2020-04-24 15:07 ` [PATCH v5 2/4] date.c: validate and set time in a helper function Đoàn Trần Công Danh
2020-04-24 15:07 ` [PATCH v5 3/4] date.c: skip fractional second part of ISO-8601 Đoàn Trần Công Danh
2020-04-24 15:07 ` [PATCH v5 4/4] date.c: allow compact version of ISO-8601 datetime Đoàn Trần Công Danh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1587740682.git.congdanhqx@gmail.com \
--to=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.