-rw-r--r-- | ui-summary.c | 42 |
1 files changed, 37 insertions, 5 deletions
diff --git a/ui-summary.c b/ui-summary.c index a2c018e..b203bcc 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -3,2 +3,3 @@ | |||
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
4 | * | 5 | * |
@@ -12,2 +13,3 @@ | |||
12 | #include "ui-refs.h" | 13 | #include "ui-refs.h" |
14 | #include "ui-blob.h" | ||
13 | 15 | ||
@@ -70,11 +72,34 @@ void cgit_print_repo_readme(char *path) | |||
70 | { | 72 | { |
71 | char *slash, *tmp; | 73 | char *slash, *tmp, *colon, *ref; |
72 | 74 | ||
73 | if (!ctx.repo->readme) | 75 | if (!ctx.repo->readme || !(*ctx.repo->readme)) |
74 | return; | 76 | return; |
75 | 77 | ||
78 | ref = NULL; | ||
79 | |||
80 | /* Check if the readme is tracked in the git repo. */ | ||
81 | colon = strchr(ctx.repo->readme, ':'); | ||
82 | if (colon && strlen(colon) > 1) { | ||
83 | *colon = '\0'; | ||
84 | ref = ctx.repo->readme; | ||
85 | ctx.repo->readme = colon + 1; | ||
86 | if (!(*ctx.repo->readme)) | ||
87 | return; | ||
88 | } | ||
89 | |||
90 | /* Prepend repo path to relative readme path unless tracked. */ | ||
91 | if (!ref && *ctx.repo->readme != '/') | ||
92 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, | ||
93 | ctx.repo->readme)); | ||
94 | |||
95 | /* If a subpath is specified for the about page, make it relative | ||
96 | * to the directory containing the configured readme. | ||
97 | */ | ||
76 | if (path) { | 98 | if (path) { |
77 | slash = strrchr(ctx.repo->readme, '/'); | 99 | slash = strrchr(ctx.repo->readme, '/'); |
78 | if (!slash) | 100 | if (!slash) { |
79 | return; | 101 | if (!colon) |
102 | return; | ||
103 | slash = colon; | ||
104 | } | ||
80 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); | 105 | tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1); |
@@ -84,2 +109,6 @@ void cgit_print_repo_readme(char *path) | |||
84 | tmp = ctx.repo->readme; | 109 | tmp = ctx.repo->readme; |
110 | |||
111 | /* Print the calculated readme, either from the git repo or from the | ||
112 | * filesystem, while applying the about-filter. | ||
113 | */ | ||
85 | html("<div id='summary'>"); | 114 | html("<div id='summary'>"); |
@@ -87,3 +116,6 @@ void cgit_print_repo_readme(char *path) | |||
87 | cgit_open_filter(ctx.repo->about_filter); | 116 | cgit_open_filter(ctx.repo->about_filter); |
88 | html_include(tmp); | 117 | if (ref) |
118 | cgit_print_file(tmp, ref); | ||
119 | else | ||
120 | html_include(tmp); | ||
89 | if (ctx.repo->about_filter) | 121 | if (ctx.repo->about_filter) |