1 files changed, 20 insertions, 45 deletions

diff --git a/ui-repolist.c b/ui-repolist.c
index 3ef2e99..3aedde5 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -18,20 +18,19 @@
 
 time_t read_agefile(char *path)
 {
-	time_t result;
-	size_t size;
-	char *buf;
-	static char buf2[64];
+	FILE *f;
+	static char buf[64], buf2[64];
 
-	if (readfile(path, &buf, &size))
+	if (!(f = fopen(path, "r")))
 		return -1;
-
+	buf[0] = 0;
+	if (fgets(buf, sizeof(buf), f) == NULL)
+		return -1;
+	fclose(f);
 	if (parse_date(buf, buf2, sizeof(buf2)))
-		result = strtoul(buf2, NULL, 10);
+		return strtoul(buf2, NULL, 10);
 	else
-		result = 0;
-	free(buf);
-	return result;
+		return 0;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
@@ -136,18 +135,6 @@ 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;
-
-	result = cmp(r1->section, r2->section);
-	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;
@@ -190,7 +177,6 @@ struct sortcolumn {
 };
 
 struct sortcolumn sortcolumn[] = {
-	{"section", sort_section},
 	{"name", sort_name},
 	{"desc", sort_desc},
 	{"owner", sort_owner},
@@ -216,8 +202,7 @@ int sort_repolist(char *field)
 void cgit_print_repolist()
 {
 	int i, columns = 4, hits = 0, header = 0;
-	char *last_section = NULL;
-	char *section;
+	char *last_group = NULL;
 	int sorted = 0;
 
 	if (ctx.cfg.enable_index_links)
@@ -233,8 +218,6 @@ void cgit_print_repolist()
 
 	if(ctx.qry.sort)
 		sorted = sort_repolist(ctx.qry.sort);
-	else
-		sort_repolist("section");
 
 	html("<table summary='repository list' class='list nowrap'>");
 	for (i=0; i<cgit_repolist.count; i++) {
@@ -248,22 +231,19 @@ void cgit_print_repolist()
 			continue;
 		if (!header++)
 			print_header(columns);
-		section = ctx.repo->section;
-		if (section && !strcmp(section, ""))
-			section = NULL;
 		if (!sorted &&
-		    ((last_section == NULL && section != NULL) ||
-		    (last_section != NULL && section == NULL) ||
-		    (last_section != NULL && section != NULL &&
-		     strcmp(section, last_section)))) {
-			htmlf("<tr class='nohover'><td colspan='%d' class='reposection'>",
+		    ((last_group == NULL && ctx.repo->group != NULL) ||
+		    (last_group != NULL && ctx.repo->group == NULL) ||
+		    (last_group != NULL && ctx.repo->group != NULL &&
+		     strcmp(ctx.repo->group, last_group)))) {
+			htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
 			      columns);
-			html_txt(section);
+			html_txt(ctx.repo->group);
 			html("</td></tr>");
-			last_section = section;
+			last_group = ctx.repo->group;
 		}
 		htmlf("<tr><td class='%s'>",
-		      !sorted && section ? "sublevel-repo" : "toplevel-repo");
+		      !sorted && ctx.repo->group ? "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);
@@ -294,11 +274,6 @@ void cgit_print_repolist()
 
 void cgit_print_site_readme()
 {
-	if (!ctx.cfg.root_readme)
-		return;
-	if (ctx.cfg.about_filter)
-		cgit_open_filter(ctx.cfg.about_filter);
-	html_include(ctx.cfg.root_readme);
-	if (ctx.cfg.about_filter)
-		cgit_close_filter(ctx.cfg.about_filter);
+	if (ctx.cfg.root_readme)
+		html_include(ctx.cfg.root_readme);
 }