ui-summary: Pass filename to about-filter

[ps-cgit] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index 0754bb7f99b8eee1f5febdb902b49e2c57470c82..ffad4f29e03e1e9d01bd8c0670b1ca74da83646c 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -8,6 +8,7 @@
  */
 
 #include "cgit.h"
+#include "ui-summary.h"
 #include "html.h"
 #include "ui-log.h"
 #include "ui-refs.h"
@@ -16,6 +17,7 @@
 static void print_url(char *base, char *suffix)
 {
        int columns = 3;
+       struct strbuf basebuf = STRBUF_INIT;
 
        if (ctx.repo->enable_log_filecount)
                columns++;
@@ -24,13 +26,16 @@ static void print_url(char *base, char *suffix)
 
        if (!base || !*base)
                return;
-       if (suffix && *suffix)
-               base = fmt("%s/%s", base, suffix);
+       if (suffix && *suffix) {
+               strbuf_addf(&basebuf, "%s/%s", base, suffix);
+               base = basebuf.buf;
+       }
        htmlf("<tr><td colspan='%d'><a href='", columns);
        html_url_path(base);
        html("'>");
        html_txt(base);
        html("</a></td></tr>\n");
+       strbuf_release(&basebuf);
 }
 
 static void print_urls(char *txt, char *suffix)
@@ -93,6 +98,7 @@ void cgit_print_summary()
 void cgit_print_repo_readme(char *path)
 {
        char *slash, *tmp, *colon, *ref;
+       int free_filename = 0;
 
        if (!ctx.repo->readme || !(*ctx.repo->readme))
                return;
@@ -103,7 +109,12 @@ void cgit_print_repo_readme(char *path)
        colon = strchr(ctx.repo->readme, ':');
        if (colon && strlen(colon) > 1) {
                *colon = '\0';
-               ref = ctx.repo->readme;
+               /* If it starts with a colon, we want to use
+                * the default branch */
+               if (colon == ctx.repo->readme && ctx.repo->defbranch)
+                       ref = ctx.repo->defbranch;
+               else
+                       ref = ctx.repo->readme;
                ctx.repo->readme = colon + 1;
                if (!(*ctx.repo->readme))
                        return;
@@ -111,8 +122,8 @@ void cgit_print_repo_readme(char *path)
 
        /* Prepend repo path to relative readme path unless tracked. */
        if (!ref && *ctx.repo->readme != '/')
-               ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path,
-                                              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.
@@ -124,6 +135,7 @@ void cgit_print_repo_readme(char *path)
                                return;
                        slash = colon;
                }
+               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);
@@ -134,13 +146,19 @@ void cgit_print_repo_readme(char *path)
         * filesystem, while applying the about-filter.
         */
        html("<div id='summary'>");
-       if (ctx.repo->about_filter)
+       if (ctx.repo->about_filter) {
+               ctx.repo->about_filter->argv[1] = tmp;
                cgit_open_filter(ctx.repo->about_filter);
+       }
        if (ref)
                cgit_print_file(tmp, ref);
        else
                html_include(tmp);
-       if (ctx.repo->about_filter)
+       if (ctx.repo->about_filter) {
                cgit_close_filter(ctx.repo->about_filter);
+               ctx.repo->about_filter->argv[1] = NULL;
+       }
        html("</div>");
+       if (free_filename)
+               free(tmp);
 }