ui-summary: enable arbitrary paths below repo.readme

This change makes it possible to include any number of pages below
the 'about' tab for a repository. The path is assumed to be located
in the same directory as the 'repo.readme' file.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

diff --git a/cmd.c b/cmd.c
index cf97da75a17f733b0627066921dbabf424165a6c..766f90397b89d2407574f3e2bf7056df68b43add 100644 (file)
--- a/cmd.c
+++ b/cmd.c
@@ -39,7 +39,7 @@ static void atom_fn(struct cgit_context *ctx)
 static void about_fn(struct cgit_context *ctx)
 {
        if (ctx->repo)
-               cgit_print_repo_readme();
+               cgit_print_repo_readme(ctx->qry.path);
        else
                cgit_print_site_readme();
 }

diff --git a/ui-summary.c b/ui-summary.c
index ede4a629765e4d58314d6c78e408159ef3dfddab..f2a9b4626058b0caa50b70d1971954ebf9002135 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -66,11 +66,23 @@ void cgit_print_summary()
        html("</table>");
 }
 
-void cgit_print_repo_readme()
+void cgit_print_repo_readme(char *path)
 {
-       if (ctx.repo->readme) {
-               html("<div id='summary'>");
-               html_include(ctx.repo->readme);
-               html("</div>");
-       }
+       char *slash, *tmp;
+
+       if (!ctx.repo->readme)
+               return;
+
+       if (path) {
+               slash = strrchr(ctx.repo->readme, '/');
+               if (!slash)
+                       return;
+               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
+               tmp = ctx.repo->readme;
+       html("<div id='summary'>");
+       html_include(tmp);
+       html("</div>");
 }

diff --git a/ui-summary.h b/ui-summary.h
index 3e130394915d6b7d77785a311fab4f528bd0ed9b..c01f56012dcdcd64f39f6935c20eb5d18efb1b33 100644 (file)
--- a/ui-summary.h
+++ b/ui-summary.h
@@ -2,6 +2,6 @@
 #define UI_SUMMARY_H
 
 extern void cgit_print_summary();
-extern void cgit_print_repo_readme();
+extern void cgit_print_repo_readme(char *path);
 
 #endif /* UI_SUMMARY_H */