On Sat, 16 Aug 2008, Linus Torvalds wrote:
>
> Junio: we might also make the code that actually parses the
> seconds-per-epoch thing only trigger if we haven't already seen a date (ie
> it might check for "tm->tm_year < 0" etc before accepting that seconds
> format).
Here's a slightly expanded version of the previous patch, which will
ignore those big integer if it has already seen any human-readable date
format (either any time except 0:00:00 or any normal date).
It includes the fractional second parsing code from the previous patch
too, since that's an independent thing and makes sense regardless.
Junio, your call. But this one gets the date right for strings that just
randomly have some big number in them, ie
[torvalds@nehalem git]$ ./test-date "17:25:54 917476713 2008-06-04 -0700"
17:25:54 917476713 2008-06-04 -0700 -> 1212625554 -0700 -> Wed Jun 4 17:25:54 2008
17:25:54 917476713 2008-06-04 -0700 -> Wed Jun 4 17:25:54 2008
because it will now see that "nodate()" is not true. I think it's a good
idea to only accept the epoch format when there hasn't been any other time
format visible.
Linus
---
date.c | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/date.c b/date.c
index 35a5257..e11e78e 100644
--- a/date.c
+++ b/date.c
@@ -363,6 +363,11 @@ static int match_multi_number(unsigned long num, char c, const char *date, char
tm->tm_hour = num;
tm->tm_min = num2;
tm->tm_sec = num3;
+
+ /* Ignore any possible fractional seconds */
+ if (*end == '.')
+ (void) strtol(end+1, &end, 10);
+
break;
}
return 0;
@@ -402,6 +407,15 @@ static int match_multi_number(unsigned long num, char c, const char *date, char
return end - date;
}
+/* Have we filled in any part of the time/date yet? */
+static inline int nodate(struct tm *tm)
+{
+ return tm->tm_year < 0 &&
+ tm->tm_mon < 0 &&
+ tm->tm_mday < 0 &&
+ !(tm->tm_hour | tm->tm_min | tm->tm_sec);
+}
+
/*
* We've seen a digit. Time? Year? Date?
*/
@@ -418,7 +432,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
* more than 8 digits. This is because we don't want to rule out
* numbers like 20070606 as a YYYYMMDD date.
*/
- if (num >= 100000000) {
+ if (num >= 100000000 && nodate(tm)) {
time_t time = num;
if (gmtime_r(&time, tm)) {
*tm_gmt = 1;
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
