1 files changed, 30 insertions, 31 deletions

diff --git a/ui-summary.c b/ui-summary.c
index 2f8a822..ffad4f2 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -95,71 +95,70 @@ void cgit_print_summary()
 	html("</table>");
 }
 
-/* The caller must free filename and ref after calling this. */
-void cgit_parse_readme(const char *readme, const char *path, char **filename, char **ref, struct cgit_repo *repo)
+void cgit_print_repo_readme(char *path)
 {
-	const char *slash, *colon;
-
-	*filename = NULL;
-	*ref = NULL;
+	char *slash, *tmp, *colon, *ref;
+	int free_filename = 0;
 
-	if (!readme || !(*readme))
+	if (!ctx.repo->readme || !(*ctx.repo->readme))
 		return;
 
+	ref = NULL;
+
 	/* Check if the readme is tracked in the git repo. */
-	colon = strchr(readme, ':');
+	colon = strchr(ctx.repo->readme, ':');
 	if (colon && strlen(colon) > 1) {
+		*colon = '\0';
 		/* If it starts with a colon, we want to use
 		 * the default branch */
-		if (colon == readme && repo->defbranch)
-			*ref = xstrdup(repo->defbranch);
+		if (colon == ctx.repo->readme && ctx.repo->defbranch)
+			ref = ctx.repo->defbranch;
 		else
-			*ref = xstrndup(readme, colon - readme);
-		readme = colon + 1;
+			ref = ctx.repo->readme;
+		ctx.repo->readme = colon + 1;
+		if (!(*ctx.repo->readme))
+			return;
 	}
 
 	/* Prepend repo path to relative readme path unless tracked. */
-	if (!(*ref) && *readme != '/')
-		readme = fmtalloc("%s/%s", repo->path, readme);
+	if (!ref && *ctx.repo->readme != '/')
+		ctx.repo->readme = fmtalloc("%s/%s", ctx.repo->path,
+						ctx.repo->readme);
 
 	/* If a subpath is specified for the about page, make it relative
-	 * to the directory containing the configured readme. */
+	 * to the directory containing the configured readme.
+	 */
 	if (path) {
-		slash = strrchr(readme, '/');
+		slash = strrchr(ctx.repo->readme, '/');
 		if (!slash) {
 			if (!colon)
 				return;
 			slash = colon;
 		}
-		*filename = xmalloc(slash - readme + 1 + strlen(path) + 1);
-		strncpy(*filename, readme, slash - readme + 1);
-		strcpy(*filename + (slash - readme + 1), path);
+		free_filename = 1;
+		tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
+		strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
+		strcpy(tmp + (slash - ctx.repo->readme + 1), path);
 	} else
-		*filename = xstrdup(readme);
-}
-
-void cgit_print_repo_readme(char *path)
-{
-	char *filename, *ref;
-	cgit_parse_readme(ctx.repo->readme, path, &filename, &ref, ctx.repo);
+		tmp = ctx.repo->readme;
 
 	/* Print the calculated readme, either from the git repo or from the
 	 * filesystem, while applying the about-filter.
 	 */
 	html("<div id='summary'>");
 	if (ctx.repo->about_filter) {
-		ctx.repo->about_filter->argv[1] = filename;
+		ctx.repo->about_filter->argv[1] = tmp;
 		cgit_open_filter(ctx.repo->about_filter);
 	}
 	if (ref)
-		cgit_print_file(filename, ref);
+		cgit_print_file(tmp, ref);
 	else
-		html_include(filename);
+		html_include(tmp);
 	if (ctx.repo->about_filter) {
 		cgit_close_filter(ctx.repo->about_filter);
 		ctx.repo->about_filter->argv[1] = NULL;
 	}
 	html("</div>");
-	free(filename);
-	free(ref);
+	if (free_filename)
+		free(tmp);
 }