1 files changed, 91 insertions, 142 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 1b224cf..7e7f1fb 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,40 +1,38 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
- * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
-#include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"
+#include <strings.h>
 
-static time_t read_agefile(const char *path)
+time_t read_agefile(char *path)
 {
 	time_t result;
 	size_t size;
-	char *buf = NULL;
-	struct strbuf date_buf = STRBUF_INIT;
+	char *buf;
+	static char buf2[64];
 
-	if (read_first_line(path, &buf, &size)) {
-		free(buf);
-		return 0;
-	}
+	if (readfile(path, &buf, &size))
+		return -1;
 
-	if (parse_date(buf, &date_buf) == 0)
-		result = strtoul(date_buf.buf, NULL, 10);
+	if (parse_date(buf, buf2, sizeof(buf2)) > 0)
+		result = strtoul(buf2, NULL, 10);
 	else
 		result = 0;
 	free(buf);
-	strbuf_release(&date_buf);
 	return result;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
-	struct strbuf path = STRBUF_INIT;
+	char *path;
 	struct stat s;
 	struct cgit_repo *r = (struct cgit_repo *)repo;
 
@@ -42,36 +40,32 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 		*mtime = repo->mtime;
 		return 1;
 	}
-	strbuf_addf(&path, "%s/%s", repo->path, ctx.cfg.agefile);
-	if (stat(path.buf, &s) == 0) {
-		*mtime = read_agefile(path.buf);
+	path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
+	if (stat(path, &s) == 0) {
+		*mtime = read_agefile(path);
 		if (*mtime) {
 			r->mtime = *mtime;
-			goto end;
+			return 1;
 		}
 	}
 
-	strbuf_reset(&path);
-	strbuf_addf(&path, "%s/refs/heads/%s", repo->path,
-		    repo->defbranch ? repo->defbranch : "master");
-	if (stat(path.buf, &s) == 0) {
+	path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
+		   repo->defbranch : "master");
+	if (stat(path, &s) == 0) {
 		*mtime = s.st_mtime;
 		r->mtime = *mtime;
-		goto end;
+		return 1;
 	}
 
-	strbuf_reset(&path);
-	strbuf_addf(&path, "%s/%s", repo->path, "packed-refs");
-	if (stat(path.buf, &s) == 0) {
+	path = fmt("%s/%s", repo->path, "packed-refs");
+	if (stat(path, &s) == 0) {
 		*mtime = s.st_mtime;
 		r->mtime = *mtime;
-		goto end;
+		return 1;
 	}
 
 	*mtime = 0;
 	r->mtime = *mtime;
-end:
-	strbuf_release(&path);
 	return (r->mtime != 0);
 }
 
@@ -79,10 +73,10 @@ static void print_modtime(struct cgit_repo *repo)
 {
 	time_t t;
 	if (get_repo_modtime(repo, &t))
-		cgit_print_age(t, 0, -1);
+		cgit_print_age(t, -1, NULL);
 }
 
-static int is_match(struct cgit_repo *repo)
+int is_match(struct cgit_repo *repo)
 {
 	if (!ctx.qry.search)
 		return 1;
@@ -97,56 +91,31 @@ static int is_match(struct cgit_repo *repo)
 	return 0;
 }
 
-static int is_in_url(struct cgit_repo *repo)
+int is_in_url(struct cgit_repo *repo)
 {
 	if (!ctx.qry.url)
 		return 1;
-	if (repo->url && starts_with(repo->url, ctx.qry.url))
+	if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
 		return 1;
 	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)
+void print_sort_header(const char *title, const char *sort)
 {
-	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(currenturl);
-	htmlf("?s=%s", sort);
+	htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
 	if (ctx.qry.search) {
-		html("&amp;q=");
+		html("&q=");
 		html_url_arg(ctx.qry.search);
 	}
 	htmlf("'>%s</a></th>", title);
-	free(currenturl);
 }
 
-static void print_header(void)
+void print_header(int columns)
 {
 	html("<tr class='nohover'>");
 	print_sort_header("Name", "name");
 	print_sort_header("Description", "desc");
-	if (ctx.cfg.enable_index_owner)
-		print_sort_header("Owner", "owner");
+	print_sort_header("Owner", "owner");
 	print_sort_header("Idle", "idle");
 	if (ctx.cfg.enable_index_links)
 		html("<th class='left'>Links</th>");
@@ -154,19 +123,17 @@ static void print_header(void)
 }
 
 
-static void print_pager(int items, int pagelen, char *search, char *sort)
+void print_pager(int items, int pagelen, char *search, char *sort)
 {
 	int i, ofs;
 	char *class = NULL;
-	html("<ul class='pager'>");
-	for (i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
+	html("<div class='pager'>");
+	for(i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
 		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, 0);
-		html("</li>");
+		cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), class,
+				search, sort, ofs);
 	}
-	html("</ul>");
+	html("</div>");
 }
 
 static int cmp(const char *s1, const char *s2)
@@ -184,6 +151,27 @@ static int cmp(const char *s1, const char *s2)
 	return 0;
 }
 
+static int sort_section(const void *a, const void *b)
+{
+	const struct cgit_repo *r1 = a;
+	const struct cgit_repo *r2 = b;
+	int result;
+	time_t t;
+
+	result = cmp(r1->section, r2->section);
+	if (!result) {
+		if (!strcmp(ctx.cfg.section_sort, "age")) {
+			// get_repo_modtime caches the value in r->mtime, so we don't
+			// have to worry about inefficiencies here.
+			if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))
+				result = r2->mtime - r1->mtime;
+		}
+		if (!result)
+			result = cmp(r1->name, r2->name);
+	}
+	return result;
+}
+
 static int sort_name(const void *a, const void *b)
 {
 	const struct cgit_repo *r1 = a;
@@ -220,28 +208,12 @@ static int sort_idle(const void *a, const void *b)
 	return t2 - t1;
 }
 
-static int sort_section(const void *a, const void *b)
-{
-	const struct cgit_repo *r1 = a;
-	const struct cgit_repo *r2 = b;
-	int result;
-
-	result = cmp(r1->section, r2->section);
-	if (!result) {
-		if (!strcmp(ctx.cfg.repository_sort, "age"))
-			result = sort_idle(r1, r2);
-		if (!result)
-			result = cmp(r1->name, r2->name);
-	}
-	return result;
-}
-
 struct sortcolumn {
 	const char *name;
 	int (*fn)(const void *a, const void *b);
 };
 
-static const struct sortcolumn sortcolumn[] = {
+struct sortcolumn sortcolumn[] = {
 	{"section", sort_section},
 	{"name", sort_name},
 	{"desc", sort_desc},
@@ -250,9 +222,9 @@ static const struct sortcolumn sortcolumn[] = {
 	{NULL, NULL}
 };
 
-static int sort_repolist(char *field)
+int sort_repolist(char *field)
 {
-	const struct sortcolumn *column;
+	struct sortcolumn *column;
 
 	for (column = &sortcolumn[0]; column->name; column++) {
 		if (strcmp(field, column->name))
@@ -265,38 +237,33 @@ static int sort_repolist(char *field)
 }
 
 
-void cgit_print_repolist(void)
+void cgit_print_repolist()
 {
-	int i, columns = 3, hits = 0, header = 0;
+	int i, columns = 4, 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)
-		++columns;
+		columns++;
 
 	ctx.page.title = ctx.cfg.root_title;
-	cgit_print_http_headers();
-	cgit_print_docstart();
-	cgit_print_pageheader();
+	cgit_print_http_headers(&ctx);
+	cgit_print_docstart(&ctx);
+	cgit_print_pageheader(&ctx);
+
+	if (ctx.cfg.index_header)
+		html_include(ctx.cfg.index_header);
 
-	if (ctx.qry.sort)
+	if(ctx.qry.sort)
 		sorted = sort_repolist(ctx.qry.sort);
-	else if (ctx.cfg.section_sort)
+	else
 		sort_repolist("section");
 
 	html("<table summary='repository list' class='list nowrap'>");
-	for (i = 0; i < cgit_repolist.count; i++) {
+	for (i=0; i<cgit_repolist.count; i++) {
 		ctx.repo = &cgit_repolist.repos[i];
-		if (!is_visible(ctx.repo))
+		if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
 			continue;
 		hits++;
 		if (hits <= ctx.qry.ofs)
@@ -304,7 +271,7 @@ void cgit_print_repolist(void)
 		if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
 			continue;
 		if (!header++)
-			print_header();
+			print_header(columns);
 		section = ctx.repo->section;
 		if (section && !strcmp(section, ""))
 			section = NULL;
@@ -313,7 +280,7 @@ void cgit_print_repolist(void)
 		    (last_section != NULL && section == NULL) ||
 		    (last_section != NULL && section != NULL &&
 		     strcmp(section, last_section)))) {
-			htmlf("<tr class='nohover-highlight'><td colspan='%d' class='reposection'>",
+			htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
 			      columns);
 			html_txt(section);
 			html("</td></tr>");
@@ -321,59 +288,41 @@ void cgit_print_repolist(void)
 		}
 		htmlf("<tr><td class='%s'>",
 		      !sorted && section ? "sublevel-repo" : "toplevel-repo");
-		cgit_summary_link(ctx.repo->name, NULL, NULL, NULL);
+		cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
 		html("</td><td>");
-		repourl = cgit_repourl(ctx.repo->url);
-		html_link_open(repourl, NULL, NULL);
-		free(repourl);
-		if (html_ntxt(ctx.repo->desc, ctx.cfg.max_repodesc_len) < 0)
-			html("...");
+		html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
+		html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
 		html_link_close();
 		html("</td><td>");
-		if (ctx.cfg.enable_index_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 {
-				char *currenturl = cgit_currenturl();
-				html("<a href='");
-				html_attr(currenturl);
-				html("?q=");
-				html_url_arg(ctx.repo->owner);
-				html("'>");
-				html_txt(ctx.repo->owner);
-				html("</a>");
-				free(currenturl);
-			}
-			html("</td><td>");
-		}
+		html_txt(ctx.repo->owner);
+		html("</td><td>");
 		print_modtime(ctx.repo);
 		html("</td>");
 		if (ctx.cfg.enable_index_links) {
 			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);
+				      0, NULL, NULL, ctx.qry.showmsg);
 			cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
 			html("</td>");
 		}
 		html("</tr>\n");
 	}
 	html("</table>");
-	if (hits > ctx.cfg.max_repo_count)
+	if (!hits)
+		cgit_print_error("No repositories found");
+	else 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)
+void cgit_print_site_readme()
 {
-	cgit_print_layout_start();
 	if (!ctx.cfg.root_readme)
-		goto done;
-	cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
+		return;
+	if (ctx.cfg.about_filter)
+		cgit_open_filter(ctx.cfg.about_filter);
 	html_include(ctx.cfg.root_readme);
-	cgit_close_filter(ctx.cfg.about_filter);
-done:
-	cgit_print_layout_end();
+	if (ctx.cfg.about_filter)
+		cgit_close_filter(ctx.cfg.about_filter);
 }