From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Jun 2010 13:02:47 +0000 (-0700)
Subject: Merge branch 'rr/parse-date-refactor'
X-Git-Tag: v1.7.2-rc0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8718e875080767f2c8d06c55c3fb5a6dddf0e5a0?ds=inline;hp=-c

Merge branch 'rr/parse-date-refactor'

* rr/parse-date-refactor:
Refactor parse_date for approxidate functions
---

8718e875080767f2c8d06c55c3fb5a6dddf0e5a0
diff --combined date.c
index 6bae49ca33,610ecf7507..68cdcaa3f6
--- a/date.c
+++ b/date.c
@@@ -229,7 -229,6 +229,7 @@@ static const struct 
  
  	{ "GMT",    0, 0, },	/* Greenwich Mean */
  	{ "UTC",    0, 0, },	/* Universal (Coordinated) */
 +	{ "Z",      0, 0, },    /* Zulu, alias for UTC */
  
  	{ "WET",    0, 0, },	/* Western European */
  	{ "BST",    0, 1, },	/* British Summer */
@@@ -306,7 -305,7 +306,7 @@@ static int match_alpha(const char *date
  
  	for (i = 0; i < ARRAY_SIZE(timezone_names); i++) {
  		int match = match_string(date, timezone_names[i].name);
 -		if (match >= 3) {
 +		if (match >= 3 || match == strlen(timezone_names[i].name)) {
  			int off = timezone_names[i].offset;
  
  			/* This is bogus, but we like summer */
@@@ -586,11 -585,17 +586,17 @@@ static int date_string(unsigned long da
  
  /* 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 -605,7 +606,7 @@@
  	tm.tm_hour = -1;
  	tm.tm_min = -1;
  	tm.tm_sec = -1;
- 	offset = -1;
+ 	*offset = -1;
  	tm_gmt = 0;
  
  	for (;;) {
@@@ -612,11 -617,11 +618,11 @@@
  			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 -632,26 +633,26 @@@
  	}
  
  	/* 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 -999,12 +1000,12 @@@ static unsigned long approxidate_str(co
  
  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 -1012,15 +1013,15 @@@
  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);