git-tar-tree: no more void pointer arithmetic

[git.git] / date.c

diff --git a/date.c b/date.c
index 18a0710..66be23a 100644 (file)
--- a/date.c
+++ b/date.c
@@ -42,18 +42,24 @@ static const char *weekday_names[] = {
  * thing, which means that tz -0100 is passed in as the integer -100,
  * even though it means "sixty minutes off"
  */
-const char *show_date(unsigned long time, int tz)
+static struct tm *time_to_tm(unsigned long time, int tz)
 {
-       struct tm *tm;
        time_t t;
-       static char timebuf[200];
        int minutes;
 
        minutes = tz < 0 ? -tz : tz;
        minutes = (minutes / 100)*60 + (minutes % 100);
        minutes = tz < 0 ? -minutes : minutes;
        t = time + minutes * 60;
-       tm = gmtime(&t);
+       return gmtime(&t);
+}
+
+const char *show_date(unsigned long time, int tz)
+{
+       struct tm *tm;
+       static char timebuf[200];
+
+       tm = time_to_tm(time, tz);
        if (!tm)
                return NULL;
        sprintf(timebuf, "%.3s %.3s %d %02d:%02d:%02d %d %+05d",
@@ -65,6 +71,21 @@ const char *show_date(unsigned long time, int tz)
        return timebuf;
 }
 
+const char *show_rfc2822_date(unsigned long time, int tz)
+{
+       struct tm *tm;
+       static char timebuf[200];
+
+       tm = time_to_tm(time, tz);
+       if (!tm)
+               return NULL;
+       sprintf(timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
+               weekday_names[tm->tm_wday], tm->tm_mday,
+               month_names[tm->tm_mon], tm->tm_year + 1900,
+               tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
+       return timebuf;
+}
+
 /*
  * Check these. And note how it doesn't do the summer-time conversion.
  *
@@ -123,8 +144,6 @@ static const struct {
        { "IDLE", +12, 0, },    /* International Date Line East */
 };
 
-#define NR_TZ (sizeof(timezone_names) / sizeof(timezone_names[0]))
-       
 static int match_string(const char *date, const char *str)
 {
        int i = 0;
@@ -173,7 +192,7 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
                }
        }
 
-       for (i = 0; i < NR_TZ; i++) {
+       for (i = 0; i < ARRAY_SIZE(timezone_names); i++) {
                int match = match_string(date, timezone_names[i].name);
                if (match >= 3) {
                        int off = timezone_names[i].offset;
@@ -199,26 +218,43 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
        return skip_alpha(date);
 }
 
-static int is_date(int year, int month, int day, struct tm *tm)
+static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm)
 {
        if (month > 0 && month < 13 && day > 0 && day < 32) {
+               struct tm check = *tm;
+               struct tm *r = (now_tm ? &check : tm);
+               time_t specified;
+
+               r->tm_mon = month - 1;
+               r->tm_mday = day;
                if (year == -1) {
-                       tm->tm_mon = month-1;
-                       tm->tm_mday = day;
-                       return 1;
+                       if (!now_tm)
+                               return 1;
+                       r->tm_year = now_tm->tm_year;
                }
-               if (year >= 1970 && year < 2100) {
-                       year -= 1900;
-               } else if (year > 70 && year < 100) {
-                       /* ok */
-               } else if (year < 38) {
-                       year += 100;
-               } else
+               else if (year >= 1970 && year < 2100)
+                       r->tm_year = year - 1900;
+               else if (year > 70 && year < 100)
+                       r->tm_year = year;
+               else if (year < 38)
+                       r->tm_year = year + 100;
+               else
                        return 0;
+               if (!now_tm)
+                       return 1;
+
+               specified = my_mktime(r);
 
-               tm->tm_mon = month-1;
-               tm->tm_mday = day;
-               tm->tm_year = year;
+               /* Be it commit time or author time, it does not make
+                * sense to specify timestamp way into the future.  Make
+                * sure it is not later than ten days from now...
+                */
+               if (now + 10*24*3600 < specified)
+                       return 0;
+               tm->tm_mon = r->tm_mon;
+               tm->tm_mday = r->tm_mday;
+               if (year != -1)
+                       tm->tm_year = r->tm_year;
                return 1;
        }
        return 0;
@@ -226,6 +262,9 @@ static int is_date(int year, int month, int day, struct tm *tm)
 
 static int match_multi_number(unsigned long num, char c, const char *date, char *end, struct tm *tm)
 {
+       time_t now;
+       struct tm now_tm;
+       struct tm *refuse_future;
        long num2, num3;
 
        num2 = strtol(end+1, &end, 10);
@@ -248,19 +287,33 @@ static int match_multi_number(unsigned long num, char c, const char *date, char
 
        case '-':
        case '/':
+       case '.':
+               now = time(NULL);
+               refuse_future = NULL;
+               if (gmtime_r(&now, &now_tm))
+                       refuse_future = &now_tm;
+
                if (num > 70) {
                        /* yyyy-mm-dd? */
-                       if (is_date(num, num2, num3, tm))
+                       if (is_date(num, num2, num3, refuse_future, now, tm))
                                break;
                        /* yyyy-dd-mm? */
-                       if (is_date(num, num3, num2, tm))
+                       if (is_date(num, num3, num2, refuse_future, now, tm))
                                break;
                }
-               /* mm/dd/yy ? */
-               if (is_date(num3, num, num2, tm))
+               /* Our eastern European friends say dd.mm.yy[yy]
+                * is the norm there, so giving precedence to
+                * mm/dd/yy[yy] form only when separator is not '.'
+                */
+               if (c != '.' &&
+                   is_date(num3, num, num2, refuse_future, now, tm))
+                       break;
+               /* European dd.mm.yy[yy] or funny US dd/mm/yy[yy] */
+               if (is_date(num3, num2, num, refuse_future, now, tm))
                        break;
-               /* dd/mm/yy ? */
-               if (is_date(num3, num2, num, tm))
+               /* Funny European mm.dd.yy */
+               if (c == '.' &&
+                   is_date(num3, num, num2, refuse_future, now, tm))
                        break;
                return 0;
        }
@@ -290,10 +343,11 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
        }
 
        /*
-        * Check for special formats: num[:-/]num[same]num
+        * Check for special formats: num[-.:/]num[same]num
         */
        switch (*end) {
        case ':':
+       case '.':
        case '/':
        case '-':
                if (isdigit(end[1])) {
@@ -315,7 +369,7 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
 
        /* Four-digit year or a timezone? */
        if (n == 4) {
-               if (num <= 1200 && *offset == -1) {
+               if (num <= 1400 && *offset == -1) {
                        unsigned int minutes = num % 100;
                        unsigned int hours = num / 100;
                        *offset = hours*60 + minutes;