diff options
author | Edgar Toernig <froese@gmx.de> | 2005-04-30 09:46:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-30 09:46:49 -0700 |
commit | ecee9d9e793c7573cf3730fb9746527a0a7e94e7 (patch) | |
tree | 0cd8a2506a2960a0697fd7aaa2cd0dfc38b1aa67 /commit-tree.c | |
parent | d167f147dc6995e452cdc374ffcd07f5d9abf0bc (diff) | |
download | git-ecee9d9e793c7573cf3730fb9746527a0a7e94e7.tar.gz |
[PATCH] Do date parsing by hand...
...since everything out there is either strange (libc mktime has issues
with timezones) or introduces unnecessary dependencies for people (libcurl).
This goes back to the old date parsing, but moves it out into a file of
its own, and does the "struct tm" to "seconds since epoch" handling by
hand.
I grepped through the tz-database and it seems there's one "country"
left that has non-60-minute DST: Lord Howe Island. All others dropped
that before 1970.
Diffstat (limited to 'commit-tree.c')
-rw-r--r-- | commit-tree.c | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/commit-tree.c b/commit-tree.c index 7c23b9b506..0c568d0179 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -10,7 +10,6 @@ #include <string.h> #include <ctype.h> #include <time.h> -#include <curl/curl.h> #define BLOCKING (1ul << 14) @@ -81,24 +80,6 @@ static void remove_special(char *p) } } -/* 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. */ -static void parse_date(char *date, time_t *now, char *result, int maxlen) -{ - char *p; - time_t then; - - if ((then = curl_getdate(date, now)) == 0) - return; - - /* find the timezone at the end */ - p = date + strlen(date); - while (p > date && isdigit(*--p)) - ; - if ((*p == '+' || *p == '-') && strlen(p) == 5) - snprintf(result, maxlen, "%lu %5.5s", then, p); -} - static void check_valid(unsigned char *sha1, const char *expect) { void *buf; @@ -132,8 +113,6 @@ int main(int argc, char **argv) char *audate; char comment[1000]; struct passwd *pw; - time_t now; - struct tm *tm; char *buffer; unsigned int size; @@ -163,10 +142,8 @@ int main(int argc, char **argv) strcat(realemail, "."); getdomainname(realemail+strlen(realemail), sizeof(realemail)-strlen(realemail)-1); } - time(&now); - tm = localtime(&now); - strftime(realdate, sizeof(realdate), "%s %z", tm); + datestamp(realdate, sizeof(realdate)); strcpy(date, realdate); commitgecos = getenv("COMMIT_AUTHOR_NAME") ? : realgecos; @@ -175,7 +152,7 @@ int main(int argc, char **argv) email = getenv("AUTHOR_EMAIL") ? : realemail; audate = getenv("AUTHOR_DATE"); if (audate) - parse_date(audate, &now, date, sizeof(date)); + parse_date(audate, date, sizeof(date)); remove_special(gecos); remove_special(realgecos); remove_special(commitgecos); remove_special(email); remove_special(realemail); remove_special(commitemail); |