about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-11-07 15:35:36 +0100
committerLars Hjemli <hjemli@gmail.com>2009-11-07 15:35:36 +0100
commit4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e (patch)
tree593616b5bd2e8c662d00478f50ecee86a0002224
parentui-shared.c: prettify download links when generated from tag page (diff)
parentClose fd on error in readfile() (diff)
downloadcgit-pink-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.tar.gz
cgit-pink-4b1fee00ddfbb7bfb48f85bef49b5aff928d0f2e.zip
Merge branch 'stable'
-rw-r--r--shared.c9
-rw-r--r--ui-shared.c2
2 files changed, 8 insertions, 3 deletions
diff --git a/shared.c b/shared.c
index d7b2d5a..a27ab30 100644
--- a/shared.c
+++ b/shared.c
@@ -406,12 +406,17 @@ int readfile(const char *path, char **buf, size_t *size)
 	fd = open(path, O_RDONLY);
 	if (fd == -1)
 		return errno;
-	if (fstat(fd, &st))
+	if (fstat(fd, &st)) {
+		close(fd);
 		return errno;
-	if (!S_ISREG(st.st_mode))
+	}
+	if (!S_ISREG(st.st_mode)) {
+		close(fd);
 		return EISDIR;
+	}
 	*buf = xmalloc(st.st_size + 1);
 	*size = read_in_full(fd, *buf, st.st_size);
 	(*buf)[*size] = '\0';
+	close(fd);
 	return (*size == st.st_size ? 0 : errno);
 }
diff --git a/ui-shared.c b/ui-shared.c
index 6cb7edb..3a9e67b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -20,7 +20,7 @@ static char *http_date(time_t t)
 		{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 	static char month[][4] =
 		{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
+		 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 	struct tm *tm = gmtime(&t);
 	return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
 		   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,