Extract clone URL printing to ui-shared.c

[cgit.git] / ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index ddd8f1b3392a329013cb7ee7d8c652e2847f4d22..70ea908d8547b87c0865ab4890418913141ff435 100644 (file)
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -12,62 +12,30 @@
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.h"
+#include "ui-shared.h"
 #include <libgen.h>
 
-static void print_url(char *base, char *suffix)
+static int urls;
+
+static void print_url(const char *url)
 {
        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 (suffix && *suffix) {
-               strbuf_addf(&basebuf, "%s/%s", base, suffix);
-               base = basebuf.buf;
+       if (urls++ == 0) {
+               htmlf("<tr class='nohover'><td colspan='%d'>&nbsp;</td></tr>", columns);
+               htmlf("<tr><th class='left' colspan='%d'>Clone</th></tr>\n", columns);
        }
+
        htmlf("<tr><td colspan='%d'><a href='", columns);
-       html_url_path(base);
+       html_url_path(url);
        html("'>");
-       html_txt(base);
+       html_txt(url);
        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'>&nbsp;</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()
@@ -88,10 +56,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("</table>");
 }
 
@@ -112,11 +78,11 @@ static char* append_readme_path(const char *filename, const char *ref, const cha
                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 || prefixcmp(resolved_full, resolved_base)) {
+               if (!resolved_base || !resolved_full || !starts_with(resolved_full, resolved_base)) {
                        free(full_path);
                        full_path = NULL;
                }
@@ -136,7 +102,7 @@ void cgit_print_repo_readme(char *path)
 
        if (ctx.repo->readme.nr == 0)
                return;
-       
+
        filename = ctx.repo->readme.items[0].string;
        ref = ctx.repo->readme.items[0].util;