@matheusbsbs / matheus-bagliano / commits / 01c6ad29bd
Fork 0

[PATCH] Fix strange timezone handling

We generate the ASCII representation of our internal date representation ("seconds since 1970, UTC + timezone information") in two different places. One of them uses the stupid and obvious way to make sure that it gets the sexagecimal representation right for negative timezones even if they might not be exact hours, and the other one depends on the modulus operator always matching the sign of argument. Hey, the clever one works. And C90 even specifies that behaviour. But I had to think about it for a while when I was re-visiting this area, and even if I didn't have to, it's kind of strange to have two different ways to print out the same data format. So use a common helper for this. And select the stupid and straighforward way. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Sep 21, 2005 at 15:50 UTC 01c6ad29bd1b647d4fd1acea54e374c740ec3c10
1 file changed +14 -10
date.c
+14 -10
@@ -386,12 +386,23 @@ static int match_tz(const char *date, int *offp)
386 return end - date;
387 }
388
389 +static int date_string(unsigned long date, int offset, char *buf, int len)
390 +{
391 + int sign = '+';
392 +
393 + if (offset < 0) {
394 + offset = -offset;
395 + sign = '-';
396 + }
397 + return snprintf(buf, len, "%lu %c%02d%02d", date, sign, offset / 60, offset % 60);
398 +}
399 +
400 /* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
401 (i.e. English) day/month names, and it doesn't work correctly with %z. */
402 int parse_date(const char *date, char *result, int maxlen)
403 {
404 struct tm tm;
394 - int offset, sign, tm_gmt;
405 + int offset, tm_gmt;
406 time_t then;
407
408 memset(&tm, 0, sizeof(tm));
@@ -435,14 +446,7 @@ int parse_date(const char *date, char *result, int maxlen)
446
447 if (!tm_gmt)
448 then -= offset * 60;
438 -
439 - sign = '+';
440 - if (offset < 0) {
441 - offset = -offset;
442 - sign = '-';
443 - }
444 -
445 - return snprintf(result, maxlen, "%lu %c%02d%02d", then, sign, offset/60, offset % 60);
449 + return date_string(then, offset, result, maxlen);
450 }
451
452 void datestamp(char *buf, int bufsize)
@@ -455,5 +459,5 @@ void datestamp(char *buf, int bufsize)
459 offset = my_mktime(localtime(&now)) - now;
460 offset /= 60;
461
458 - snprintf(buf, bufsize, "%lu %+05d", now, offset/60*100 + offset%60);
462 + date_string(now, offset, buf, bufsize);
463 }