X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=date.c;h=63f5a0919768112c0d3301e7afaa59edcce7da36;hb=ad4f4daae80cb00000aca76e1528add6daf8f033;hp=5ee4984421f379a1ad45564fcd1ec84b51dc6476;hpb=198b0fb635ed8a007bac0c16eab112c5e2c7995c;p=git.git

diff --git a/date.c b/date.c
index 5ee49844..63f5a091 100644
--- a/date.c
+++ b/date.c
@@ -4,12 +4,10 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
 #include <time.h>
 
+#include "cache.h"
+
 static time_t my_mktime(struct tm *tm)
 {
 	static const int mdays[] = {
@@ -39,6 +37,34 @@ static const char *weekday_names[] = {
 };
 
 /*
+ * 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;
+}
+
+/*
  * 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
@@ -114,6 +140,15 @@ static int match_string(const char *date, const char *str)
 	return i;
 }
 
+static int skip_alpha(const char *date)
+{
+	int i = 0;
+	do {
+		i++;
+	} while (isalpha(date[i]));
+	return i;
+}
+
 /*
 * Parse month, weekday, or timezone name
 */
@@ -153,8 +188,14 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
 		}
 	}
 
+	if (match_string(date, "PM") == 2) {
+		if (tm->tm_hour > 0 && tm->tm_hour < 12)
+			tm->tm_hour += 12;
+		return 2;
+	}
+
 	/* BAD CRAP */
-	return 0;
+	return skip_alpha(date);
 }
 
 static int is_date(int year, int month, int day, struct tm *tm)
@@ -182,7 +223,7 @@ static int is_date(int year, int month, int day, struct tm *tm)
 	return 0;
 }
 
-static int match_multi_number(unsigned long num, char c, char *date, char *end, struct tm *tm)
+static int match_multi_number(unsigned long num, char c, const char *date, char *end, struct tm *tm)
 {
 	long num2, num3;
 
@@ -228,7 +269,7 @@ static int match_multi_number(unsigned long num, char c, char *date, char *end,
 /*
  * We've seen a digit. Time? Year? Date? 
  */
-static int match_digit(char *date, struct tm *tm, int *offset)
+static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt)
 {
 	int n;
 	char *end;
@@ -241,8 +282,10 @@ static int match_digit(char *date, struct tm *tm, int *offset)
 	 */
 	if (num > 946684800) {
 		time_t time = num;
-		if (gmtime_r(&time, tm))
+		if (gmtime_r(&time, tm)) {
+			*tm_gmt = 1;
 			return end - date;
+		}
 	}
 
 	/*
@@ -317,7 +360,7 @@ static int match_digit(char *date, struct tm *tm, int *offset)
 	return n;
 }
 
-static int match_tz(char *date, int *offp)
+static int match_tz(const char *date, int *offp)
 {
 	char *end;
 	int offset = strtoul(date+1, &end, 10);
@@ -332,23 +375,33 @@ static int match_tz(char *date, int *offp)
 	 * a valid minute. We might want to check that the minutes
 	 * are divisible by 30 or something too.
 	 */
-	if (min >= 60 || n < 3)
-		return 0;
+	if (min < 60 && n > 2) {
+		offset = hour*60+min;
+		if (*date == '-')
+			offset = -offset;
 
-	offset = hour*60+min;
-	if (*date == '-')
-		offset = -offset;
-
-	*offp = 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);
+}
+
 /* 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)
+int parse_date(const char *date, char *result, int maxlen)
 {
 	struct tm tm;
-	int offset, sign;
+	int offset, tm_gmt;
 	time_t then;
 
 	memset(&tm, 0, sizeof(tm));
@@ -357,6 +410,7 @@ void parse_date(char *date, char *result, int maxlen)
 	tm.tm_mday = -1;
 	tm.tm_isdst = -1;
 	offset = -1;
+	tm_gmt = 0;
 
 	for (;;) {
 		int match = 0;
@@ -369,7 +423,7 @@ void parse_date(char *date, char *result, int maxlen)
 		if (isalpha(c))
 			match = match_alpha(date, &tm, &offset);
 		else if (isdigit(c))
-			match = match_digit(date, &tm, &offset);
+			match = match_digit(date, &tm, &offset, &tm_gmt);
 		else if ((c == '-' || c == '+') && isdigit(date[1]))
 			match = match_tz(date, &offset);
 
@@ -387,17 +441,11 @@ void parse_date(char *date, char *result, int maxlen)
 		offset = (then - mktime(&tm)) / 60;
 
 	if (then == -1)
-		return;
-
-	then -= offset * 60;
-
-	sign = '+';
-	if (offset < 0) {
-		offset = -offset;
-		sign = '-';
-	}
+		return -1;
 
-	snprintf(result, maxlen, "%lu %c%02d%02d", then, sign, offset/60, offset % 60);
+	if (!tm_gmt)
+		then -= offset * 60;
+	return date_string(then, offset, result, maxlen);
 }
 
 void datestamp(char *buf, int bufsize)
@@ -410,5 +458,5 @@ 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);
 }