X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=date.c;h=1c1917b4e8768b0046729e19505d6f1b0845a0d8;hb=fc4c4cd21c783b6dc387002c6e018d26f7405e9f;hp=1e43936f8ebb9c7462347ab3a8b192a973b36195;hpb=ecee9d9e793c7573cf3730fb9746527a0a7e94e7;p=git.git diff --git a/date.c b/date.c index 1e43936f..1c1917b4 100644 --- a/date.c +++ b/date.c @@ -4,11 +4,10 @@ * Copyright (C) Linus Torvalds, 2005 */ -#include -#include -#include -#include #include +#include + +#include "cache.h" static time_t my_mktime(struct tm *tm) { @@ -30,144 +29,422 @@ static time_t my_mktime(struct tm *tm) } static const char *month_names[] = { - "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + "January", "February", "March", "April", "May", "June", + "July", "August", "September", "October", "November", "December" }; static const char *weekday_names[] = { - "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + "Sundays", "Mondays", "Tuesdays", "Wednesdays", "Thursdays", "Fridays", "Saturdays" }; +/* + * The "tz" thing is passed in as this strange "decimal parse of tz" + * 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) +{ + 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); + if (!tm) + return NULL; + sprintf(timebuf, "%.3s %.3s %d %02d:%02d:%02d %d %+05d", + weekday_names[tm->tm_wday], + month_names[tm->tm_mon], + tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec, + tm->tm_year + 1900, tz); + return timebuf; +} -static char *skipfws(char *str) +/* + * Check these. And note how it doesn't do the summer-time conversion. + * + * In my world, it's always summer, and things are probably a bit off + * in other ways too. + */ +static const struct { + const char *name; + int offset; + int dst; +} timezone_names[] = { + { "IDLW", -12, 0, }, /* International Date Line West */ + { "NT", -11, 0, }, /* Nome */ + { "CAT", -10, 0, }, /* Central Alaska */ + { "HST", -10, 0, }, /* Hawaii Standard */ + { "HDT", -10, 1, }, /* Hawaii Daylight */ + { "YST", -9, 0, }, /* Yukon Standard */ + { "YDT", -9, 1, }, /* Yukon Daylight */ + { "PST", -8, 0, }, /* Pacific Standard */ + { "PDT", -8, 1, }, /* Pacific Daylight */ + { "MST", -7, 0, }, /* Mountain Standard */ + { "MDT", -7, 1, }, /* Mountain Daylight */ + { "CST", -6, 0, }, /* Central Standard */ + { "CDT", -6, 1, }, /* Central Daylight */ + { "EST", -5, 0, }, /* Eastern Standard */ + { "EDT", -5, 1, }, /* Eastern Daylight */ + { "AST", -3, 0, }, /* Atlantic Standard */ + { "ADT", -3, 1, }, /* Atlantic Daylight */ + { "WAT", -1, 0, }, /* West Africa */ + + { "GMT", 0, 0, }, /* Greenwich Mean */ + { "UTC", 0, 0, }, /* Universal (Coordinated) */ + + { "WET", 0, 0, }, /* Western European */ + { "BST", 0, 1, }, /* British Summer */ + { "CET", +1, 0, }, /* Central European */ + { "MET", +1, 0, }, /* Middle European */ + { "MEWT", +1, 0, }, /* Middle European Winter */ + { "MEST", +1, 1, }, /* Middle European Summer */ + { "CEST", +1, 1, }, /* Central European Summer */ + { "MESZ", +1, 1, }, /* Middle European Summer */ + { "FWT", +1, 0, }, /* French Winter */ + { "FST", +1, 1, }, /* French Summer */ + { "EET", +2, 0, }, /* Eastern Europe, USSR Zone 1 */ + { "EEST", +2, 1, }, /* Eastern European Daylight */ + { "WAST", +7, 0, }, /* West Australian Standard */ + { "WADT", +7, 1, }, /* West Australian Daylight */ + { "CCT", +8, 0, }, /* China Coast, USSR Zone 7 */ + { "JST", +9, 0, }, /* Japan Standard, USSR Zone 8 */ + { "EAST", +10, 0, }, /* Eastern Australian Standard */ + { "EADT", +10, 1, }, /* Eastern Australian Daylight */ + { "GST", +10, 0, }, /* Guam Standard, USSR Zone 9 */ + { "NZT", +11, 0, }, /* New Zealand */ + { "NZST", +11, 0, }, /* New Zealand Standard */ + { "NZDT", +11, 1, }, /* New Zealand Daylight */ + { "IDLE", +12, 0, }, /* International Date Line East */ +}; + +static int match_string(const char *date, const char *str) { - while (isspace(*str)) - str++; - return str; + int i = 0; + + for (i = 0; *date; date++, str++, i++) { + if (*date == *str) + continue; + if (toupper(*date) == toupper(*str)) + continue; + if (!isalnum(*date)) + break; + return 0; + } + return i; } - -/* 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. */ -void parse_date(char *date, char *result, int maxlen) +static int skip_alpha(const char *date) { - struct tm tm; - char *p, *tz; - int i, offset; - time_t then; + int i = 0; + do { + i++; + } while (isalpha(date[i])); + return i; +} - memset(&tm, 0, sizeof(tm)); +/* +* Parse month, weekday, or timezone name +*/ +static int match_alpha(const char *date, struct tm *tm, int *offset) +{ + int i; - /* Skip day-name */ - p = skipfws(date); - if (!isdigit(*p)) { - for (i=0; i<7; i++) { - if (!strncmp(p,weekday_names[i],3) && p[3] == ',') { - p = skipfws(p+4); - goto day; - } + for (i = 0; i < 12; i++) { + int match = match_string(date, month_names[i]); + if (match >= 3) { + tm->tm_mon = i; + return match; } - return; - } + } + + for (i = 0; i < 7; i++) { + int match = match_string(date, weekday_names[i]); + if (match >= 3) { + tm->tm_wday = i; + return match; + } + } - /* day */ - day: - tm.tm_mday = strtoul(p, &p, 10); + 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; - if (tm.tm_mday < 1 || tm.tm_mday > 31) - return; + /* This is bogus, but we like summer */ + off += timezone_names[i].dst; - if (!isspace(*p)) - return; + /* Only use the tz name offset if we don't have anything better */ + if (*offset == -1) + *offset = 60*off; - p = skipfws(p); + return match; + } + } + + if (match_string(date, "PM") == 2) { + if (tm->tm_hour > 0 && tm->tm_hour < 12) + tm->tm_hour += 12; + return 2; + } - /* month */ + /* BAD CRAP */ + return skip_alpha(date); +} - for (i=0; i<12; i++) { - if (!strncmp(p, month_names[i], 3) && isspace(p[3])) { - tm.tm_mon = i; - p = skipfws(p+strlen(month_names[i])); - goto year; +static int is_date(int year, int month, int day, struct tm *tm) +{ + if (month > 0 && month < 13 && day > 0 && day < 32) { + if (year == -1) { + tm->tm_mon = month-1; + tm->tm_mday = day; + return 1; } + if (year >= 1970 && year < 2100) { + year -= 1900; + } else if (year > 70 && year < 100) { + /* ok */ + } else if (year < 38) { + year += 100; + } else + return 0; + + tm->tm_mon = month-1; + tm->tm_mday = day; + tm->tm_year = year; + return 1; } - return; /* Error -- bad month */ + return 0; +} - /* year */ - year: - tm.tm_year = strtoul(p, &p, 10); +static int match_multi_number(unsigned long num, char c, const char *date, char *end, struct tm *tm) +{ + long num2, num3; + + num2 = strtol(end+1, &end, 10); + num3 = -1; + if (*end == c && isdigit(end[1])) + num3 = strtol(end+1, &end, 10); + + /* Time? Date? */ + switch (c) { + case ':': + if (num3 < 0) + num3 = 0; + if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) { + tm->tm_hour = num; + tm->tm_min = num2; + tm->tm_sec = num3; + break; + } + return 0; + + case '-': + case '/': + if (num > 70) { + /* yyyy-mm-dd? */ + if (is_date(num, num2, num3, tm)) + break; + /* yyyy-dd-mm? */ + if (is_date(num, num3, num2, tm)) + break; + } + /* mm/dd/yy ? */ + if (is_date(num3, num2, num, tm)) + break; + /* dd/mm/yy ? */ + if (is_date(num3, num, num2, tm)) + break; + return 0; + } + return end - date; +} + +/* + * We've seen a digit. Time? Year? Date? + */ +static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt) +{ + int n; + char *end; + unsigned long num; + + num = strtoul(date, &end, 10); + + /* + * Seconds since 1970? We trigger on that for anything after Jan 1, 2000 + */ + if (num > 946684800) { + time_t time = num; + if (gmtime_r(&time, tm)) { + *tm_gmt = 1; + return end - date; + } + } + + /* + * Check for special formats: num[:-/]num[same]num + */ + switch (*end) { + case ':': + case '/': + case '-': + if (isdigit(end[1])) { + int match = match_multi_number(num, *end, date, end, tm); + if (match) + return match; + } + } + + /* + * None of the special formats? Try to guess what + * the number meant. We use the number of digits + * to make a more educated guess.. + */ + n = 0; + do { + n++; + } while (isdigit(date[n])); + + /* Four-digit year or a timezone? */ + if (n == 4) { + if (num <= 1200 && *offset == -1) { + unsigned int minutes = num % 100; + unsigned int hours = num / 100; + *offset = hours*60 + minutes; + } else if (num > 1900 && num < 2100) + tm->tm_year = num - 1900; + return n; + } + + /* + * NOTE! We will give precedence to day-of-month over month or + * year numbers in the 1-12 range. So 05 is always "mday 5", + * unless we already have a mday.. + * + * IOW, 01 Apr 05 parses as "April 1st, 2005". + */ + if (num > 0 && num < 32 && tm->tm_mday < 0) { + tm->tm_mday = num; + return n; + } - if (!tm.tm_year && !isspace(*p)) - return; + /* Two-digit year? */ + if (n == 2 && tm->tm_year < 0) { + if (num < 10 && tm->tm_mday >= 0) { + tm->tm_year = num + 100; + return n; + } + if (num >= 70) { + tm->tm_year = num; + return n; + } + } - if (tm.tm_year > 1900) - tm.tm_year -= 1900; + if (num > 0 && num < 32) { + tm->tm_mday = num; + } else if (num > 1900) { + tm->tm_year = num - 1900; + } else if (num > 70) { + tm->tm_year = num; + } else if (num > 0 && num < 13) { + tm->tm_mon = num-1; + } - p=skipfws(p); - - /* hour */ - if (!isdigit(*p)) - return; - tm.tm_hour = strtoul(p, &p, 10); - - if (tm.tm_hour > 23) - return; - - if (*p != ':') - return; /* Error -- bad time */ - p++; - - /* minute */ - if (!isdigit(*p)) - return; - tm.tm_min = strtoul(p, &p, 10); - - if (tm.tm_min > 59) - return; - - if (*p != ':') - goto zone; - p++; - - /* second */ - if (!isdigit(*p)) - return; - tm.tm_sec = strtoul(p, &p, 10); - - if (tm.tm_sec > 60) - return; - - zone: - if (!isspace(*p)) - return; - - p = skipfws(p); - - if (*p == '-') - offset = -60; - else if (*p == '+') - offset = 60; - else - return; - - if (!isdigit(p[1]) || !isdigit(p[2]) || !isdigit(p[3]) || !isdigit(p[4])) - return; - - tz = p; - i = strtoul(p+1, NULL, 10); - offset *= ((i % 100) + ((i / 100) * 60)); - - p = skipfws(p + 5); - if (*p && *p != '(') /* trailing comment like (EDT) is ok */ - return; - - then = my_mktime(&tm); /* mktime uses local timezone */ - if (then == -1) - return; + return n; +} + +static int match_tz(const char *date, int *offp) +{ + char *end; + int offset = strtoul(date+1, &end, 10); + int min, hour; + int n = end - date - 1; + + min = offset % 100; + hour = offset / 100; + + /* + * Don't accept any random crap.. At least 3 digits, and + * a valid minute. We might want to check that the minutes + * are divisible by 30 or something too. + */ + if (min < 60 && n > 2) { + offset = hour*60+min; + if (*date == '-') + offset = -offset; + + *offp = offset; + } + return end - date; +} + +static int date_string(unsigned long date, int offset, char *buf, int len) +{ + int sign = '+'; + + if (offset < 0) { + offset = -offset; + sign = '-'; + } + return snprintf(buf, len, "%lu %c%02d%02d", date, sign, offset / 60, offset % 60); +} - then -= offset; +/* 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) +{ + struct tm tm; + int offset, tm_gmt; + time_t then; + + memset(&tm, 0, sizeof(tm)); + tm.tm_year = -1; + tm.tm_mon = -1; + tm.tm_mday = -1; + tm.tm_isdst = -1; + offset = -1; + tm_gmt = 0; + + for (;;) { + int match = 0; + unsigned char c = *date; + + /* Stop at end of string or newline */ + if (!c || c == '\n') + break; + + if (isalpha(c)) + match = match_alpha(date, &tm, &offset); + else if (isdigit(c)) + match = match_digit(date, &tm, &offset, &tm_gmt); + else if ((c == '-' || c == '+') && isdigit(date[1])) + match = match_tz(date, &offset); + + if (!match) { + /* BAD CRAP */ + match = 1; + } + + date += match; + } + + /* mktime uses local timezone */ + then = my_mktime(&tm); + if (offset == -1) + offset = (then - mktime(&tm)) / 60; - snprintf(result, maxlen, "%lu %5.5s", then, tz); + if (then == -1) + return -1; + + if (!tm_gmt) + then -= offset * 60; + return date_string(then, offset, result, maxlen); } void datestamp(char *buf, int bufsize) @@ -180,5 +457,188 @@ void datestamp(char *buf, int bufsize) offset = my_mktime(localtime(&now)) - now; offset /= 60; - snprintf(buf, bufsize, "%lu %+05d", now, offset/60*100 + offset%60); + date_string(now, offset, buf, bufsize); +} + +static void update_tm(struct tm *tm, unsigned long sec) +{ + time_t n = mktime(tm) - sec; + localtime_r(&n, tm); +} + +static void date_yesterday(struct tm *tm, int *num) +{ + update_tm(tm, 24*60*60); +} + +static void date_time(struct tm *tm, int hour) +{ + if (tm->tm_hour < hour) + date_yesterday(tm, NULL); + tm->tm_hour = hour; + tm->tm_min = 0; + tm->tm_sec = 0; +} + +static void date_midnight(struct tm *tm, int *num) +{ + date_time(tm, 0); +} + +static void date_noon(struct tm *tm, int *num) +{ + date_time(tm, 12); +} + +static void date_tea(struct tm *tm, int *num) +{ + date_time(tm, 17); +} + +static const struct special { + const char *name; + void (*fn)(struct tm *, int *); +} special[] = { + { "yesterday", date_yesterday }, + { "noon", date_noon }, + { "midnight", date_midnight }, + { "tea", date_tea }, + { NULL } +}; + +static const char *number_name[] = { + "zero", "one", "two", "three", "four", + "five", "six", "seven", "eight", "nine", "ten", +}; + +static const struct typelen { + const char *type; + int length; +} typelen[] = { + { "seconds", 1 }, + { "minutes", 60 }, + { "hours", 60*60 }, + { "days", 24*60*60 }, + { "weeks", 7*24*60*60 }, + { NULL } +}; + +static const char *approxidate_alpha(const char *date, struct tm *tm, int *num) +{ + const struct typelen *tl; + const struct special *s; + const char *end = date; + int n = 1, i; + + while (isalpha(*++end)) + n++; + + for (i = 0; i < 12; i++) { + int match = match_string(date, month_names[i]); + if (match >= 3) { + tm->tm_mon = i; + return end; + } + } + + for (s = special; s->name; s++) { + int len = strlen(s->name); + if (match_string(date, s->name) == len) { + s->fn(tm, num); + return end; + } + } + + if (!*num) { + for (i = 1; i < 11; i++) { + int len = strlen(number_name[i]); + if (match_string(date, number_name[i]) == len) { + *num = i; + return end; + } + } + if (match_string(date, "last") == 4) + *num = 1; + return end; + } + + tl = typelen; + while (tl->type) { + int len = strlen(tl->type); + if (match_string(date, tl->type) >= len-1) { + update_tm(tm, tl->length * *num); + *num = 0; + return end; + } + tl++; + } + + for (i = 0; i < 7; i++) { + int match = match_string(date, weekday_names[i]); + if (match >= 3) { + int diff, n = *num -1; + *num = 0; + + diff = tm->tm_wday - i; + if (diff <= 0) + n++; + diff += 7*n; + + update_tm(tm, diff * 24 * 60 * 60); + return end; + } + } + + if (match_string(date, "months") >= 5) { + int n = tm->tm_mon - *num; + *num = 0; + while (n < 0) { + n += 12; + tm->tm_year--; + } + tm->tm_mon = n; + return end; + } + + if (match_string(date, "years") >= 4) { + tm->tm_year -= *num; + *num = 0; + return end; + } + + return end; +} + +unsigned long approxidate(const char *date) +{ + int number = 0; + struct tm tm, now; + struct timeval tv; + char buffer[50]; + + if (parse_date(date, buffer, sizeof(buffer)) > 0) + return strtoul(buffer, NULL, 10); + + gettimeofday(&tv, NULL); + localtime_r(&tv.tv_sec, &tm); + now = tm; + for (;;) { + unsigned char c = *date; + if (!c) + break; + date++; + if (isdigit(c)) { + char *end; + number = strtoul(date-1, &end, 10); + date = end; + continue; + } + if (isalpha(c)) + date = approxidate_alpha(date-1, &tm, &number); + } + if (number > 0 && number < 32) + tm.tm_mday = number; + if (tm.tm_mon > now.tm_mon && tm.tm_year == now.tm_year) + tm.tm_year--; + return mktime(&tm); }