Use skip_prefix() to get rid of magic constants

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index a2e9e0776b70ea1ae69d88844d0db5e4333ab471..1d9a7f74d28708c6779d88012f8b760bb22b67b4 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -15,7 +15,7 @@ static time_t read_agefile(char *path)
 {
        time_t result;
        size_t size;
-       char *buf;
+       char *buf = NULL;
        struct strbuf date_buf = STRBUF_INIT;
 
        if (readfile(path, &buf, &size)) {
@@ -79,7 +79,7 @@ static void print_modtime(struct cgit_repo *repo)
 {
        time_t t;
        if (get_repo_modtime(repo, &t))
-               cgit_print_age(t, -1, NULL);
+               cgit_print_age(t, 0, -1);
 }
 
 static int is_match(struct cgit_repo *repo)
@@ -106,6 +106,26 @@ static int is_in_url(struct cgit_repo *repo)
        return 0;
 }
 
+static int is_visible(struct cgit_repo *repo)
+{
+       if (repo->hide || repo->ignore)
+               return 0;
+       if (!(is_match(repo) && is_in_url(repo)))
+               return 0;
+       return 1;
+}
+
+static int any_repos_visible(void)
+{
+       int i;
+
+       for (i = 0; i < cgit_repolist.count; i++) {
+               if (is_visible(&cgit_repolist.repos[i]))
+                       return 1;
+       }
+       return 0;
+}
+
 static void print_sort_header(const char *title, const char *sort)
 {
        char *currenturl = cgit_currenturl();
@@ -255,8 +275,14 @@ void cgit_print_repolist(void)
        int i, columns = 3, hits = 0, header = 0;
        char *last_section = NULL;
        char *section;
+       char *repourl;
        int sorted = 0;
 
+       if (!any_repos_visible()) {
+               cgit_print_error_page(404, "Not found", "No repositories found");
+               return;
+       }
+
        if (ctx.cfg.enable_index_links)
                ++columns;
        if (ctx.cfg.enable_index_owner)
@@ -278,9 +304,7 @@ void cgit_print_repolist(void)
        html("<table summary='repository list' class='list nowrap'>");
        for (i = 0; i < cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];
-               if (ctx.repo->hide || ctx.repo->ignore)
-                       continue;
-               if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
+               if (!is_visible(ctx.repo))
                        continue;
                hits++;
                if (hits <= ctx.qry.ofs)
@@ -307,7 +331,9 @@ void cgit_print_repolist(void)
                      !sorted && section ? "sublevel-repo" : "toplevel-repo");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
-               html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
+               repourl = cgit_repourl(ctx.repo->url);
+               html_link_open(repourl, NULL, NULL);
+               free(repourl);
                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                html_link_close();
                html("</td><td>");
@@ -340,9 +366,7 @@ void cgit_print_repolist(void)
                html("</tr>\n");
        }
        html("</table>");
-       if (!hits)
-               cgit_print_error("No repositories found");
-       else if (hits > ctx.cfg.max_repo_count)
+       if (hits > ctx.cfg.max_repo_count)
                print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
        cgit_print_docend();
 }