X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/536c7a1eb201b44b9266babe087cb6f2b75e4a7f..7fb12a8ee0789e3eab2680ae6c3fde0f0f233d22:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index b203bcc..5598d08 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -1,49 +1,70 @@ /* ui-summary.c: functions for generating repo summary page * * Copyright (C) 2006 Lars Hjemli - * Copyright (C) 2010 Jason A. Donenfeld + * Copyright (C) 2010-2013 Jason A. Donenfeld * * 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 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(" "); - html("Clone\n"); + if (suffix && *suffix) { + strbuf_addf(&basebuf, "%s/%s", base, suffix); + base = basebuf.buf; } - if (suffix && *suffix) - base = fmt("%s/%s", base, suffix); - html(""); html_txt(base); html("\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(" ", columns); + htmlf("Clone\n", columns); + } print_url(h, suffix); *t = c; h = t; @@ -52,73 +73,98 @@ static void print_urls(char *txt, char *suffix) void cgit_print_summary() { + int columns = 3; + + if (ctx.repo->enable_log_filecount) + columns++; + if (ctx.repo->enable_log_linecount) + columns++; + html(""); cgit_print_branches(ctx.cfg.summary_branches); - html(""); + htmlf("", columns); cgit_print_tags(ctx.cfg.summary_tags); if (ctx.cfg.summary_log > 0) { - html(""); + htmlf("", 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("
 
 
 
 
"); } -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("
"); - 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("
"); + if (free_filename) + free(filename); }