summaryrefslogtreecommitdiff
path: root/date.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 13:02:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-21 13:02:47 (GMT)
commit8718e875080767f2c8d06c55c3fb5a6dddf0e5a0 (patch)
tree79c93d36c3f32344a87d1466999fa2c1896d3530 /date.c
parentd4f8f74bc6cf8c5851f67d46c49b6e2c8fea601b (diff)
parentc5043cc18579854681aa51ddb6e744fe2db24f51 (diff)
downloadgit-8718e875080767f2c8d06c55c3fb5a6dddf0e5a0.zip
git-8718e875080767f2c8d06c55c3fb5a6dddf0e5a0.tar.gz
git-8718e875080767f2c8d06c55c3fb5a6dddf0e5a0.tar.bz2
Merge branch 'rr/parse-date-refactor'
* rr/parse-date-refactor: Refactor parse_date for approxidate functions
Diffstat (limited to 'date.c')
-rw-r--r--date.c56
1 files changed, 37 insertions, 19 deletions
diff --git a/date.c b/date.c
index 6bae49c..68cdcaa 100644
--- a/date.c
+++ b/date.c
@@ -586,11 +586,17 @@ static int date_string(unsigned long date, int offset, char *buf, int len)
/* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
(i.e. English) day/month names, and it doesn't work correctly with %z. */
-int parse_date(const char *date, char *result, int maxlen)
+int parse_date_toffset(const char *date, unsigned long *timestamp, int *offset)
{
struct tm tm;
- int offset, tm_gmt;
- time_t then;
+ int tm_gmt;
+ unsigned long dummy_timestamp;
+ int dummy_offset;
+
+ if (!timestamp)
+ timestamp = &dummy_timestamp;
+ if (!offset)
+ offset = &dummy_offset;
memset(&tm, 0, sizeof(tm));
tm.tm_year = -1;
@@ -600,7 +606,7 @@ int parse_date(const char *date, char *result, int maxlen)
tm.tm_hour = -1;
tm.tm_min = -1;
tm.tm_sec = -1;
- offset = -1;
+ *offset = -1;
tm_gmt = 0;
for (;;) {
@@ -612,11 +618,11 @@ int parse_date(const char *date, char *result, int maxlen)
break;
if (isalpha(c))
- match = match_alpha(date, &tm, &offset);
+ match = match_alpha(date, &tm, offset);
else if (isdigit(c))
- match = match_digit(date, &tm, &offset, &tm_gmt);
+ match = match_digit(date, &tm, offset, &tm_gmt);
else if ((c == '-' || c == '+') && isdigit(date[1]))
- match = match_tz(date, &offset);
+ match = match_tz(date, offset);
if (!match) {
/* BAD CRAP */
@@ -627,16 +633,26 @@ int parse_date(const char *date, char *result, int maxlen)
}
/* mktime uses local timezone */
- then = tm_to_time_t(&tm);
- if (offset == -1)
- offset = (then - mktime(&tm)) / 60;
+ *timestamp = tm_to_time_t(&tm);
+ if (*offset == -1)
+ *offset = (*timestamp - mktime(&tm)) / 60;
- if (then == -1)
+ if (*timestamp == -1)
return -1;
if (!tm_gmt)
- then -= offset * 60;
- return date_string(then, offset, result, maxlen);
+ *timestamp -= *offset * 60;
+ return 1; /* success */
+}
+
+int parse_date(const char *date, char *result, int maxlen)
+{
+ unsigned long timestamp;
+ int offset;
+ if (parse_date_toffset(date, &timestamp, &offset) > 0)
+ return date_string(timestamp, offset, result, maxlen);
+ else
+ return -1;
}
enum date_mode parse_date_format(const char *format)
@@ -984,11 +1000,12 @@ static unsigned long approxidate_str(const char *date,
unsigned long approxidate_relative(const char *date, const struct timeval *tv)
{
- char buffer[50];
+ unsigned long timestamp;
+ int offset;
int errors = 0;
- if (parse_date(date, buffer, sizeof(buffer)) > 0)
- return strtoul(buffer, NULL, 0);
+ if (parse_date_toffset(date, &timestamp, &offset) > 0)
+ return timestamp;
return approxidate_str(date, tv, &errors);
}
@@ -996,14 +1013,15 @@ unsigned long approxidate_relative(const char *date, const struct timeval *tv)
unsigned long approxidate_careful(const char *date, int *error_ret)
{
struct timeval tv;
- char buffer[50];
+ unsigned long timestamp;
+ int offset;
int dummy = 0;
if (!error_ret)
error_ret = &dummy;
- if (parse_date(date, buffer, sizeof(buffer)) > 0) {
+ if (parse_date_toffset(date, &timestamp, &offset) > 0) {
*error_ret = 0;
- return strtoul(buffer, NULL, 0);
+ return timestamp;
}
gettimeofday(&tv, NULL);