X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/69f705cf5727cc1f099f6cd6af759f66bfd9a343..ed3497b0de6634350cd17b320538fba918d4084c:/ui-refs.c

diff --git a/ui-refs.c b/ui-refs.c
index caddfbc..c97b0c6 100644
--- a/ui-refs.c
+++ b/ui-refs.c
@@ -1,17 +1,16 @@
 /* ui-refs.c: browse symbolic refs
  *
- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "ui-refs.h"
 #include "html.h"
 #include "ui-shared.h"
 
-static int header;
-
 static int cmp_age(int age1, int age2)
 {
 	if (age1 != 0 && age2 != 0)
@@ -95,14 +94,14 @@ static void print_tag_header()
 	     "<th class='left'>Download</th>"
 	     "<th class='left'>Author</th>"
 	     "<th class='left' colspan='2'>Age</th></tr>\n");
-	header = 1;
 }
 
 static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 {
 	const struct cgit_snapshot_format* f;
-    	char *filename;
+	struct strbuf filename = STRBUF_INIT;
 	const char *basename;
+	int free_ref = 0;
 
 	if (!ref || strlen(ref) < 2)
 		return;
@@ -111,67 +110,70 @@ static void print_tag_downloads(const struct cgit_repo *repo, const char *ref)
 	if (prefixcmp(ref, basename) != 0) {
 		if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1]))
 			ref++;
-		if (isdigit(ref[0]))
-			ref = xstrdup(fmt("%s-%s", basename, ref));
+		if (isdigit(ref[0])) {
+			ref = fmtalloc("%s-%s", basename, ref);
+			free_ref = 1;
+		}
 	}
 
 	for (f = cgit_snapshot_formats; f->suffix; f++) {
 		if (!(repo->snapshots & f->bit))
 			continue;
-		filename = fmt("%s%s", ref, f->suffix);
-		cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename);
+		strbuf_reset(&filename);
+		strbuf_addf(&filename, "%s%s", ref, f->suffix);
+		cgit_snapshot_link(filename.buf, NULL, NULL, NULL, NULL, filename.buf);
 		html("&nbsp;&nbsp;");
 	}
+
+	if (free_ref)
+		free((char *)ref);
+	strbuf_release(&filename);
 }
+
 static int print_tag(struct refinfo *ref)
 {
-	struct tag *tag;
-	struct taginfo *info;
+	struct tag *tag = NULL;
+	struct taginfo *info = NULL;
 	char *name = (char *)ref->refname;
+	struct object *obj = ref->object;
 
-	if (ref->object->type == OBJ_TAG) {
-		tag = (struct tag *)ref->object;
+	if (obj->type == OBJ_TAG) {
+		tag = (struct tag *)obj;
+		obj = tag->tagged;
 		info = ref->tag;
 		if (!tag || !info)
 			return 1;
-		html("<tr><td>");
-		cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
-		html("</td><td>");
-		if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT))
-			print_tag_downloads(ctx.repo, name);
-		else
-			cgit_object_link(tag->tagged);
-		html("</td><td>");
+	}
+
+	html("<tr><td>");
+	cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
+	html("</td><td>");
+	if (ctx.repo->snapshots && (obj->type == OBJ_COMMIT))
+		print_tag_downloads(ctx.repo, name);
+	else
+		cgit_object_link(obj);
+	html("</td><td>");
+	if (info) {
 		if (info->tagger)
-			html(info->tagger);
-		html("</td><td colspan='2'>");
+			html_txt(info->tagger);
+	} else if (ref->object->type == OBJ_COMMIT) {
+		html_txt(ref->commit->author);
+	}
+	html("</td><td colspan='2'>");
+	if (info) {
 		if (info->tagger_date > 0)
 			cgit_print_age(info->tagger_date, -1, NULL);
-		html("</td></tr>\n");
-	} else {
-		if (!header)
-			print_tag_header();
-		html("<tr><td>");
-		cgit_tag_link(name, NULL, NULL, ctx.qry.head, name);
-		html("</td><td>");
-		if (ctx.repo->snapshots && (ref->object->type == OBJ_COMMIT))
-			print_tag_downloads(ctx.repo, name);
-		else
-			cgit_object_link(ref->object);
-		html("</td><td>");
-		if (ref->object->type == OBJ_COMMIT)
-			html(ref->commit->author);
-		html("</td><td colspan='2'>");
-		if (ref->object->type == OBJ_COMMIT)
-			cgit_print_age(ref->commit->commit->date, -1, NULL);
-		html("</td></tr>\n");
+	} else if (ref->object->type == OBJ_COMMIT) {
+		cgit_print_age(ref->commit->commit->date, -1, NULL);
 	}
+	html("</td></tr>\n");
+
 	return 0;
 }
 
 static void print_refs_link(char *path)
 {
-	html("<tr class='nohover'><td colspan='4'>");
+	html("<tr class='nohover'><td colspan='5'>");
 	cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
 	html("</td></tr>");
 }
@@ -195,16 +197,17 @@ void cgit_print_branches(int maxcount)
 	if (maxcount == 0 || maxcount > list.count)
 		maxcount = list.count;
 
-	if (maxcount < list.count) {
-		qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+	qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
+	if (ctx.repo->branch_sort == 0)
 		qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
-	}
 
-	for(i=0; i<maxcount; i++)
+	for (i = 0; i < maxcount; i++)
 		print_branch(list.refs[i]);
 
 	if (maxcount < list.count)
 		print_refs_link("heads");
+
+	cgit_free_reflist_inner(&list);
 }
 
 void cgit_print_tags(int maxcount)
@@ -212,7 +215,6 @@ void cgit_print_tags(int maxcount)
 	struct reflist list;
 	int i;
 
-	header = 0;
 	list.refs = NULL;
 	list.alloc = list.count = 0;
 	for_each_tag_ref(cgit_refs_cb, &list);
@@ -224,11 +226,13 @@ void cgit_print_tags(int maxcount)
 	else if (maxcount > list.count)
 		maxcount = list.count;
 	print_tag_header();
-	for(i=0; i<maxcount; i++)
+	for (i = 0; i < maxcount; i++)
 		print_tag(list.refs[i]);
 
 	if (maxcount < list.count)
 		print_refs_link("tags");
+
+	cgit_free_reflist_inner(&list);
 }
 
 void cgit_print_refs()
@@ -236,13 +240,13 @@ void cgit_print_refs()
 
 	html("<table class='list nowrap'>");
 
-	if (ctx.qry.path && !strncmp(ctx.qry.path, "heads", 5))
+	if (ctx.qry.path && !prefixcmp(ctx.qry.path, "heads"))
 		cgit_print_branches(0);
-	else if (ctx.qry.path && !strncmp(ctx.qry.path, "tags", 4))
+	else if (ctx.qry.path && !prefixcmp(ctx.qry.path, "tags"))
 		cgit_print_tags(0);
 	else {
 		cgit_print_branches(0);
-		html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
+		html("<tr class='nohover'><td colspan='5'>&nbsp;</td></tr>");
 		cgit_print_tags(0);
 	}
 	html("</table>");