ui-repolist: fix memory leak

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 12ac1fc1303a3fa3209c6428cfdf686933a1f0a2..7158bf7cf643b3b90c47cfab040796ff013ad2ea 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -10,17 +10,18 @@
 #include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"
-#include <strings.h>
 
 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))
+       if (readfile(path, &buf, &size)) {
+               free(buf);
                return -1;
+       }
 
        if (parse_date(buf, &date_buf) == 0)
                result = strtoul(date_buf.buf, NULL, 10);
@@ -78,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)
@@ -105,19 +106,41 @@ 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();
        html("<th class='left'><a href='");
-       html_attr(cgit_currenturl());
+       html_attr(currenturl);
        htmlf("?s=%s", sort);
        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);
+       free(currenturl);
 }
 
-static void print_header()
+static void print_header(void)
 {
        html("<tr class='nohover'>");
        print_sort_header("Name", "name");
@@ -140,7 +163,7 @@ static void print_pager(int items, int pagelen, char *search, char *sort)
                class = (ctx.qry.ofs == ofs) ? "current" : NULL;
                html("<li>");
                cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
-                               class, search, sort, ofs);
+                               class, search, sort, ofs, 0);
                html("</li>");
        }
        html("</ul>");
@@ -223,7 +246,7 @@ struct sortcolumn {
        int (*fn)(const void *a, const void *b);
 };
 
-struct sortcolumn sortcolumn[] = {
+static const struct sortcolumn sortcolumn[] = {
        {"section", sort_section},
        {"name", sort_name},
        {"desc", sort_desc},
@@ -234,7 +257,7 @@ struct sortcolumn sortcolumn[] = {
 
 static int sort_repolist(char *field)
 {
-       struct sortcolumn *column;
+       const struct sortcolumn *column;
 
        for (column = &sortcolumn[0]; column->name; column++) {
                if (strcmp(field, column->name))
@@ -247,13 +270,19 @@ static int sort_repolist(char *field)
 }
 
 
-void cgit_print_repolist()
+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)
@@ -275,9 +304,7 @@ void cgit_print_repolist()
        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)
@@ -304,7 +331,9 @@ void cgit_print_repolist()
                      !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>");
@@ -314,13 +343,15 @@ void cgit_print_repolist()
                                html_txt(ctx.repo->owner);
                                cgit_close_filter(ctx.repo->owner_filter);
                        } else {
+                               char *currenturl = cgit_currenturl();
                                html("<a href='");
-                               html_attr(cgit_currenturl());
+                               html_attr(currenturl);
                                html("?q=");
                                html_url_arg(ctx.repo->owner);
                                html("'>");
                                html_txt(ctx.repo->owner);
                                html("</a>");
+                               free(currenturl);
                        }
                        html("</td><td>");
                }
@@ -330,25 +361,26 @@ void cgit_print_repolist()
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
-                                     0, NULL, NULL, ctx.qry.showmsg);
+                                     0, NULL, NULL, ctx.qry.showmsg, 0);
                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                        html("</td>");
                }
                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();
 }
 
-void cgit_print_site_readme()
+void cgit_print_site_readme(void)
 {
+       cgit_print_layout_start();
        if (!ctx.cfg.root_readme)
-               return;
+               goto done;
        cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
        html_include(ctx.cfg.root_readme);
        cgit_close_filter(ctx.cfg.about_filter);
+done:
+       cgit_print_layout_end();
 }