X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/800380dde797ae35d738a644acdae2fabb9a0d44..30304d8156a72ffc95e45e1aa9407319b81bd253:/ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index f9cb21a..edefc4c 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -17,16 +17,17 @@ static time_t read_agefile(char *path)
 	time_t result;
 	size_t size;
 	char *buf;
-	static char buf2[64];
+	struct strbuf date_buf = STRBUF_INIT;
 
 	if (readfile(path, &buf, &size))
 		return -1;
 
-	if (parse_date(buf, buf2, sizeof(buf2)) > 0)
-		result = strtoul(buf2, NULL, 10);
+	if (parse_date(buf, &date_buf) == 0)
+		result = strtoul(date_buf.buf, NULL, 10);
 	else
 		result = 0;
 	free(buf);
+	strbuf_release(&date_buf);
 	return result;
 }
 
@@ -99,7 +100,7 @@ static int is_in_url(struct cgit_repo *repo)
 {
 	if (!ctx.qry.url)
 		return 1;
-	if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
+	if (repo->url && starts_with(repo->url, ctx.qry.url))
 		return 1;
 	return 0;
 }
@@ -107,7 +108,7 @@ static int is_in_url(struct cgit_repo *repo)
 static void print_sort_header(const char *title, const char *sort)
 {
 	html("<th class='left'><a href='");
-	html_attr(cgit_rooturl());
+	html_attr(cgit_currenturl());
 	htmlf("?s=%s", sort);
 	if (ctx.qry.search) {
 		html("&amp;q=");
@@ -116,7 +117,7 @@ static void print_sort_header(const char *title, const char *sort)
 	htmlf("'>%s</a></th>", title);
 }
 
-static void print_header()
+static void print_header(void)
 {
 	html("<tr class='nohover'>");
 	print_sort_header("Name", "name");
@@ -139,7 +140,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>");
@@ -222,7 +223,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},
@@ -233,7 +234,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))
@@ -246,7 +247,7 @@ 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;
@@ -259,9 +260,9 @@ void cgit_print_repolist()
 		++columns;
 
 	ctx.page.title = ctx.cfg.root_title;
-	cgit_print_http_headers(&ctx);
-	cgit_print_docstart(&ctx);
-	cgit_print_pageheader(&ctx);
+	cgit_print_http_headers();
+	cgit_print_docstart();
+	cgit_print_pageheader();
 
 	if (ctx.cfg.index_header)
 		html_include(ctx.cfg.index_header);
@@ -274,6 +275,8 @@ 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)))
 			continue;
 		hits++;
@@ -306,7 +309,19 @@ void cgit_print_repolist()
 		html_link_close();
 		html("</td><td>");
 		if (ctx.cfg.enable_index_owner) {
-			html_txt(ctx.repo->owner);
+			if (ctx.repo->owner_filter) {
+				cgit_open_filter(ctx.repo->owner_filter);
+				html_txt(ctx.repo->owner);
+				cgit_close_filter(ctx.repo->owner_filter);
+			} else {
+				html("<a href='");
+				html_attr(cgit_currenturl());
+				html("?q=");
+				html_url_arg(ctx.repo->owner);
+				html("'>");
+				html_txt(ctx.repo->owner);
+				html("</a>");
+			}
 			html("</td><td>");
 		}
 		print_modtime(ctx.repo);
@@ -315,7 +330,7 @@ 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>");
 		}
@@ -329,7 +344,7 @@ void cgit_print_repolist()
 	cgit_print_docend();
 }
 
-void cgit_print_site_readme()
+void cgit_print_site_readme(void)
 {
 	if (!ctx.cfg.root_readme)
 		return;