X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/92f6940975f6771f3a08d497c02575ee5bdc79da..e15842af627de03845b9c949f1f1596d94e3be02:/shared.c

diff --git a/shared.c b/shared.c
index d7b2d5a..5f46793 100644
--- a/shared.c
+++ b/shared.c
@@ -59,6 +59,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
 	ret->snapshots = ctx.cfg.snapshots;
 	ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
 	ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
+	ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
 	ret->max_stats = ctx.cfg.max_stats;
 	ret->module_link = ctx.cfg.module_link;
 	ret->readme = NULL;
@@ -400,18 +401,25 @@ int cgit_close_filter(struct cgit_filter *filter)
  */
 int readfile(const char *path, char **buf, size_t *size)
 {
-	int fd;
+	int fd, e;
 	struct stat st;
 
 	fd = open(path, O_RDONLY);
 	if (fd == -1)
 		return errno;
-	if (fstat(fd, &st))
-		return errno;
-	if (!S_ISREG(st.st_mode))
+	if (fstat(fd, &st)) {
+		e = errno;
+		close(fd);
+		return e;
+	}
+	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);
+	e = errno;
 	(*buf)[*size] = '\0';
-	return (*size == st.st_size ? 0 : errno);
+	close(fd);
+	return (*size == st.st_size ? 0 : e);
 }