X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/79c985e13c10b498c3ea62f4607c2e2a460c3b10..121e65391446069a538ae8d3f7938452178de7c6:/ui-summary.c diff --git a/ui-summary.c b/ui-summary.c index 3728c3e..b0af073 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -12,36 +12,13 @@ #include "ui-log.h" #include "ui-refs.h" #include "ui-blob.h" +#include "ui-shared.h" #include -static void print_url(char *base, char *suffix) -{ - int columns = 3; - struct strbuf basebuf = STRBUF_INIT; +static int urls; - if (ctx.repo->enable_log_filecount) - columns++; - if (ctx.repo->enable_log_linecount) - columns++; - - if (!base || !*base) - return; - if (suffix && *suffix) { - strbuf_addf(&basebuf, "%s/%s", base, suffix); - base = basebuf.buf; - } - htmlf(""); - html_txt(base); - html("\n"); - strbuf_release(&basebuf); -} - -static void print_urls(char *txt, char *suffix) +static void print_url(const char *url) { - char *h = txt, *t, c; - int urls = 0; int columns = 3; if (ctx.repo->enable_log_filecount) @@ -49,28 +26,21 @@ static void print_urls(char *txt, char *suffix) 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; + if (urls++ == 0) { + htmlf(" ", columns); + htmlf("Clone\n", columns); } + + htmlf(""); + html_txt(url); + html("\n"); } -void cgit_print_summary() +void cgit_print_summary(void) { int columns = 3; @@ -88,10 +58,8 @@ void cgit_print_summary() cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, NULL, NULL, 0, 0, 0); } - if (ctx.repo->clone_url) - print_urls(expand_macros(ctx.repo->clone_url), NULL); - else if (ctx.cfg.clone_prefix) - print_urls(ctx.cfg.clone_prefix, ctx.repo->url); + urls = 0; + cgit_add_clone_urls(print_url); html(""); }