/* ui-summary.c: functions for generating repo summary page
*
* Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
+#include "ui-summary.h"
#include "html.h"
#include "ui-log.h"
#include "ui-refs.h"
#include "ui-blob.h"
-
-int urls = 0;
+#include <libgen.h>
static void print_url(char *base, char *suffix)
{
+ int columns = 3;
+ struct strbuf basebuf = STRBUF_INIT;
+
+ if (ctx.repo->enable_log_filecount)
+ columns++;
+ if (ctx.repo->enable_log_linecount)
+ columns++;
+
if (!base || !*base)
return;
- if (urls++ == 0) {
- html("<tr class='nohover'><td colspan='4'> </td></tr>");
- html("<tr><th class='left' colspan='4'>Clone</th></tr>\n");
+ if (suffix && *suffix) {
+ strbuf_addf(&basebuf, "%s/%s", base, suffix);
+ base = basebuf.buf;
}
- if (suffix && *suffix)
- base = fmt("%s/%s", base, suffix);
- html("<tr><td colspan='4'><a href='");
+ 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)
{
char *h = txt, *t, c;
+ int urls = 0;
+ int columns = 3;
+
+ if (ctx.repo->enable_log_filecount)
+ columns++;
+ if (ctx.repo->enable_log_linecount)
+ columns++;
+
while (h && *h) {
while (h && *h == ' ')
h++;
+ if (!*h)
+ break;
t = h;
while (t && *t && *t != ' ')
t++;
c = *t;
*t = 0;
+ if (urls++ == 0) {
+ htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
+ htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
+ }
print_url(h, suffix);
*t = c;
h = t;
void cgit_print_summary()
{
+ int columns = 3;
+
+ if (ctx.repo->enable_log_filecount)
+ columns++;
+ if (ctx.repo->enable_log_linecount)
+ columns++;
+
html("<table summary='repository info' class='list nowrap'>");
cgit_print_branches(ctx.cfg.summary_branches);
- html("<tr class='nohover'><td colspan='4'> </td></tr>");
+ htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
cgit_print_tags(ctx.cfg.summary_tags);
if (ctx.cfg.summary_log > 0) {
- html("<tr class='nohover'><td colspan='4'> </td></tr>");
+ htmlf("<tr class='nohover'><td colspan='%d'> </td></tr>", columns);
cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL,
- NULL, NULL, 0);
+ NULL, NULL, 0, 0, 0);
}
if (ctx.repo->clone_url)
- print_urls(ctx.repo->clone_url, NULL);
+ print_urls(expand_macros(ctx.repo->clone_url), NULL);
else if (ctx.cfg.clone_prefix)
print_urls(ctx.cfg.clone_prefix, ctx.repo->url);
html("</table>");
}
-void cgit_print_repo_readme(char *path)
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)
{
- char *slash, *tmp, *colon, *ref;
+ char *file, *base_dir, *full_path, *resolved_base = NULL, *resolved_full = NULL;
+ /* If a subpath is specified for the about page, make it relative
+ * to the directory containing the configured readme. */
- if (!ctx.repo->readme || !(*ctx.repo->readme))
- return;
+ file = xstrdup(filename);
+ base_dir = dirname(file);
+ if (!strcmp(base_dir, ".") || !strcmp(base_dir, "..")) {
+ if (!ref) {
+ free(file);
+ return NULL;
+ }
+ full_path = xstrdup(path);
+ } else
+ full_path = fmtalloc("%s/%s", base_dir, path);
+
+ if (!ref) {
+ resolved_base = realpath(base_dir, NULL);
+ resolved_full = realpath(full_path, NULL);
+ if (!resolved_base || !resolved_full || strncmp(resolved_base, resolved_full, strlen(resolved_base))) {
+ free(full_path);
+ full_path = NULL;
+ }
+ }
- ref = NULL;
+ free(file);
+ free(resolved_base);
+ free(resolved_full);
- /* Check if the readme is tracked in the git repo. */
- colon = strchr(ctx.repo->readme, ':');
- if (colon && strlen(colon) > 1) {
- *colon = '\0';
- ref = ctx.repo->readme;
- ctx.repo->readme = colon + 1;
- if (!(*ctx.repo->readme))
- return;
- }
+ return full_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));
+void cgit_print_repo_readme(char *path)
+{
+ char *filename, *ref;
+ int free_filename = 0;
+
+ if (ctx.repo->readme.nr == 0)
+ return;
+
+ filename = ctx.repo->readme.items[0].string;
+ ref = ctx.repo->readme.items[0].util;
- /* If a subpath is specified for the about page, make it relative
- * to the directory containing the configured readme.
- */
if (path) {
- slash = strrchr(ctx.repo->readme, '/');
- if (!slash) {
- if (!colon)
- return;
- slash = colon;
- }
- 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;
+ free_filename = 1;
+ filename = append_readme_path(filename, ref, path);
+ if (!filename)
+ return;
+ }
/* 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)
+ if (ctx.repo->about_filter) {
+ ctx.repo->about_filter->argv[1] = filename;
cgit_open_filter(ctx.repo->about_filter);
+ }
if (ref)
- cgit_print_file(tmp, ref);
+ cgit_print_file(filename, ref, 1);
else
- html_include(tmp);
- if (ctx.repo->about_filter)
+ html_include(filename);
+ 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(filename);
}
git.ckatri.com / cgit.git / blobdiff