Use & instead of & in URLs.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

6 files changed, 13 insertions, 13 deletions

diff --git a/ui-commit.c b/ui-commit.c
index 6b135aa..1d12bbb 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -1,240 +1,240 @@
 /* ui-commit.c: generate commit view
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int files, slots;
 static int total_adds, total_rems, max_changes;
 static int lines_added, lines_removed;
 
 static struct fileinfo {
 	char status;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
 	unsigned short old_mode;
 	unsigned short new_mode;
 	char *old_path;
 	char *new_path;
 	unsigned int added;
 	unsigned int removed;
 } *items;
 
 
 void print_fileinfo(struct fileinfo *info)
 {
 	char *query, *query2;
 	char *class;
 
 	switch (info->status) {
 	case DIFF_STATUS_ADDED:
 		class = "add";
 		break;
 	case DIFF_STATUS_COPIED:
 		class = "cpy";
 		break;
 	case DIFF_STATUS_DELETED:
 		class = "del";
 		break;
 	case DIFF_STATUS_MODIFIED:
 		class = "upd";
 		break;
 	case DIFF_STATUS_RENAMED:
 		class = "mov";
 		break;
 	case DIFF_STATUS_TYPE_CHANGED:
 		class = "typ";
 		break;
 	case DIFF_STATUS_UNKNOWN:
 		class = "unk";
 		break;
 	case DIFF_STATUS_UNMERGED:
 		class = "stg";
 		break;
 	default:
 		die("bug: unhandled diff status %c", info->status);
 	}
 
 	html("<tr>");
 	htmlf("<td class='mode'>");
 	if (is_null_sha1(info->new_sha1)) {
 		html_filemode(info->old_mode);
 	} else {
 		html_filemode(info->new_mode);
 	}
 
 	if (info->old_mode != info->new_mode &&
 	    !is_null_sha1(info->old_sha1) &&
 	    !is_null_sha1(info->new_sha1)) {
 		html("<span class='modechange'>[");
 		html_filemode(info->old_mode);
 		html("]</span>");
 	}
 	htmlf("</td><td class='%s'>", class);
-	query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1),
+	query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
 		    sha1_to_hex(info->new_sha1), info->new_path);
 	html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
 		       NULL, NULL);
 	if (info->status == DIFF_STATUS_COPIED ||
 	    info->status == DIFF_STATUS_RENAMED) {
 		html_txt(info->new_path);
 		htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
 		      "copied" : "renamed");
 		query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
 		html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
 			       NULL, NULL);
 		html_txt(info->old_path);
 		html("</a>)");
 	} else {
 		html_txt(info->new_path);
 		html("</a>");
 	}
 	html("</td><td class='right'>");
 	htmlf("%d", info->added + info->removed);
 	html("</td><td class='graph'>");
 	htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes));
 	htmlf("<td class='add' style='width: %.1f%%;'/>",
 	      info->added * 100.0 / max_changes);
 	htmlf("<td class='rem' style='width: %.1f%%;'/>",
 	      info->removed * 100.0 / max_changes);
 	htmlf("<td class='none' style='width: %.1f%%;'/>",
 	      (max_changes - info->removed - info->added) * 100.0 / max_changes);
 	html("</tr></table></td></tr>\n");
 }
 
 void cgit_count_diff_lines(char *line, int len)
 {
 	if (line && (len > 0)) {
 		if (line[0] == '+')
 			lines_added++;
 		else if (line[0] == '-')
 			lines_removed++;
 	}
 }
 
 void inspect_filepair(struct diff_filepair *pair)
 {
 	files++;
 	lines_added = 0;
 	lines_removed = 0;
 	cgit_diff_files(pair->one->sha1, pair->two->sha1, cgit_count_diff_lines);
 	if (files >= slots) {
 		if (slots == 0)
 			slots = 4;
 		else
 			slots = slots * 2;
 		items = xrealloc(items, slots * sizeof(struct fileinfo));
 	}
 	items[files-1].status = pair->status;
 	hashcpy(items[files-1].old_sha1, pair->one->sha1);
 	hashcpy(items[files-1].new_sha1, pair->two->sha1);
 	items[files-1].old_mode = pair->one->mode;
 	items[files-1].new_mode = pair->two->mode;
 	items[files-1].old_path = xstrdup(pair->one->path);
 	items[files-1].new_path = xstrdup(pair->two->path);
 	items[files-1].added = lines_added;
 	items[files-1].removed = lines_removed;
 	if (lines_added + lines_removed > max_changes)
 		max_changes = lines_added + lines_removed;
 	total_adds += lines_added;
 	total_rems += lines_removed;
 }
 
 
 void cgit_print_commit(const char *hex)
 {
 	struct commit *commit, *parent;
 	struct commitinfo *info;
 	struct commit_list *p;
 	unsigned char sha1[20];
 	char *query;
 	char *filename;
 	int i;
 
 	if (get_sha1(hex, sha1)) {
 		cgit_print_error(fmt("Bad object id: %s", hex));
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit) {
 		cgit_print_error(fmt("Bad commit reference: %s", hex));
 		return;
 	}
 	info = cgit_parse_commit(commit);
 
 	html("<table class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
 	html_txt(info->author);
 	html(" ");
 	html_txt(info->author_email);
 	html("</td><td class='right'>");
 	cgit_print_date(info->author_date, FMT_LONGDATE);
 	html("</td></tr>\n");
 	html("<tr><th>committer</th><td>");
 	html_txt(info->committer);
 	html(" ");
 	html_txt(info->committer_email);
 	html("</td><td class='right'>");
 	cgit_print_date(info->committer_date, FMT_LONGDATE);
 	html("</td></tr>\n");
 	html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
-	query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1),
+	query = fmt("h=%s&amp;id=%s", sha1_to_hex(commit->object.sha1),
 		    sha1_to_hex(commit->tree->object.sha1));
 	html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
 	htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
       	for (p = commit->parents; p ; p = p->next) {
 		parent = lookup_commit_reference(p->item->object.sha1);
 		if (!parent) {
 			html("<tr><td colspan='3'>");
 			cgit_print_error("Error reading parent commit");
 			html("</td></tr>");
 			continue;
 		}
 		html("<tr><th>parent</th>"
 		     "<td colspan='2' class='sha1'>"
 		     "<a href='");
 		query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
 		html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
 		htmlf("'>%s</a> (<a href='",
 		      sha1_to_hex(p->item->object.sha1));
-		query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1),
+		query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
 			    sha1_to_hex(commit->tree->object.sha1));
 		html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
 		html("'>diff</a>)</td></tr>");
 	}
 	if (cgit_repo->snapshots) {
 		htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
 		filename = fmt("%s-%s.zip", cgit_query_repo, hex);
 		html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
-				       fmt("id=%s&name=%s", hex, filename)));
+				       fmt("id=%s&amp;name=%s", hex, filename)));
 		htmlf("'>%s</a></td></tr>", filename);
 	}
 	html("</table>\n");
 	html("<div class='commit-subject'>");
 	html_txt(info->subject);
 	html("</div>");
 	html("<div class='commit-msg'>");
 	html_txt(info->msg);
 	html("</div>");
 	if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
 		html("<div class='diffstat-header'>Diffstat</div>");
 		html("<table class='diffstat'>");
 		max_changes = 0;
 		cgit_diff_commit(commit, inspect_filepair);
 		for(i = 0; i<files; i++)
 			print_fileinfo(&items[i]);
 		html("</table>");
 		html("<div class='diffstat-summary'>");
 		htmlf("%d files changed, %d insertions, %d deletions (",
 		      files, total_adds, total_rems);
 		query = fmt("h=%s", hex);
 		html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), NULL, NULL);
 		html("show diff</a>)");
 		html("</div>");
 	}
 	cgit_free_commitinfo(info);
 }
diff --git a/ui-log.c b/ui-log.c
index c80fd73..75bbbe4 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,128 +1,128 @@
 /* ui-log.c: functions for log output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 int files, lines;
 
 void count_lines(char *line, int size)
 {
 	if (size>0 && (line[0] == '+' || line[0] == '-'))
 		lines++;
 }
 
 void inspect_files(struct diff_filepair *pair)
 {
 	files++;
 	if (cgit_repo->enable_log_linecount)
 		cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
 }
 
 void print_commit(struct commit *commit)
 {
 	struct commitinfo *info;
 
 	info = cgit_parse_commit(commit);
 	html("<tr><td>");
 	cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
 	html("</td><td>");
 	char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
 	char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
 	html_link_open(url, NULL, NULL);
 	html_ntxt(cgit_max_msg_len, info->subject);
 	html_link_close();
 	if (cgit_repo->enable_log_filecount) {
 		files = 0;
 		lines = 0;
 		cgit_diff_commit(commit, inspect_files);
 		html("</td><td class='right'>");
 		htmlf("%d", files);
 		if (cgit_repo->enable_log_linecount) {
 			html("</td><td class='right'>");
 			htmlf("%d", lines);
 		}
 	}
 	html("</td><td>");
 	html_txt(info->author);
 	html("</td></tr>\n");
 	cgit_free_commitinfo(info);
 }
 
 
 void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
 {
 	struct rev_info rev;
 	struct commit *commit;
 	const char *argv[] = {NULL, tip, NULL, NULL, NULL};
 	int argc = 2;
 	int i;
 
 	if (grep)
 		argv[argc++] = fmt("--grep=%s", grep);
 	if (path) {
 		argv[argc++] = "--";
 		argv[argc++] = path;
 	}
 	init_revisions(&rev, NULL);
 	rev.abbrev = DEFAULT_ABBREV;
 	rev.commit_format = CMIT_FMT_DEFAULT;
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(argc, argv, &rev, NULL);
 	if (rev.grep_filter) {
 		rev.grep_filter->regflags |= REG_ICASE;
 		compile_grep_patterns(rev.grep_filter);
 	}
 	prepare_revision_walk(&rev);
 
 	html("<table class='list nowrap'>");
 	html("<tr class='nohover'><th class='left'>Age</th>"
 	     "<th class='left'>Message</th>");
 
 	if (cgit_repo->enable_log_filecount) {
 		html("<th class='left'>Files</th>");
 		if (cgit_repo->enable_log_linecount)
 			html("<th class='left'>Lines</th>");
 	}
 	html("<th class='left'>Author</th></tr>\n");
 
 	if (ofs<0)
 		ofs = 0;
 
 	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 
 	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
 		print_commit(commit);
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 	html("</table>\n");
 
 	html("<div class='pager'>");
 	if (ofs > 0) {
 		html("&nbsp;<a href='");
 		html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-				  fmt("h=%s&ofs=%d", tip, ofs-cnt)));
+				  fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
 		html("'>[prev]</a>&nbsp;");
        	}
 
 	if ((commit = get_revision(&rev)) != NULL) {
 		html("&nbsp;<a href='");
 		html(cgit_pageurl(cgit_query_repo, "log",
-				  fmt("h=%s&ofs=%d", tip, ofs+cnt)));
+				  fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
 		html("'>[next]</a>&nbsp;");
 	}
 	html("</div>");
 }
diff --git a/ui-shared.c b/ui-shared.c
index c8c1c21..aba93e8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,221 +1,221 @@
 /* ui-shared.c: common web output functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 
 static char *http_date(time_t t)
 {
 	static char day[][4] =
 		{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 	static char month[][4] =
 		{"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 		 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
 	struct tm *tm = gmtime(&t);
 	return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
 		   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
 		   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
 static long ttl_seconds(long ttl)
 {
 	if (ttl<0)
 		return 60 * 60 * 24 * 365;
 	else
 		return ttl * 60;
 }
 
 void cgit_print_error(char *msg)
 {
 	html("<div class='error'>");
 	html_txt(msg);
 	html("</div>\n");
 }
 
 char *cgit_rooturl()
 {
 	if (cgit_virtual_root)
 		return fmt("%s/", cgit_virtual_root);
 	else
 		return cgit_script_name;
 }
 
 char *cgit_repourl(const char *reponame)
 {
 	if (cgit_virtual_root) {
 		return fmt("%s/%s/", cgit_virtual_root, reponame);
 	} else {
 		return fmt("?r=%s", reponame);
 	}
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
 		   const char *query)
 {
 	if (cgit_virtual_root) {
 		if (query)
 			return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
 				   pagename, query);
 		else
 			return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
 				   pagename);
 	} else {
 		if (query)
-			return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+			return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
 		else
-			return fmt("?r=%s&p=%s", reponame, pagename);
+			return fmt("?r=%s&amp;p=%s", reponame, pagename);
 	}
 }
 
 char *cgit_currurl()
 {
 	if (!cgit_virtual_root)
 		return cgit_script_name;
 	else if (cgit_query_page)
 		return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
 	else if (cgit_query_repo)
 		return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
 	else
 		return fmt("%s/", cgit_virtual_root);
 }
 
 
 void cgit_print_date(time_t secs, char *format)
 {
 	char buf[64];
 	struct tm *time;
 
 	time = gmtime(&secs);
 	strftime(buf, sizeof(buf)-1, format, time);
 	html_txt(buf);
 }
 
 void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
 	time_t now, secs;
 
 	time(&now);
 	secs = now - t;
 
 	if (secs > max_relative && max_relative >= 0) {
 		cgit_print_date(t, format);
 		return;
 	}
 
 	if (secs < TM_HOUR * 2) {
 		htmlf("<span class='age-mins'>%.0f min.</span>",
 		      secs * 1.0 / TM_MIN);
 		return;
 	}
 	if (secs < TM_DAY * 2) {
 		htmlf("<span class='age-hours'>%.0f hours</span>",
 		      secs * 1.0 / TM_HOUR);
 		return;
 	}
 	if (secs < TM_WEEK * 2) {
 		htmlf("<span class='age-days'>%.0f days</span>",
 		      secs * 1.0 / TM_DAY);
 		return;
 	}
 	if (secs < TM_MONTH * 2) {
 		htmlf("<span class='age-weeks'>%.0f weeks</span>",
 		      secs * 1.0 / TM_WEEK);
 		return;
 	}
 	if (secs < TM_YEAR * 2) {
 		htmlf("<span class='age-months'>%.0f months</span>",
 		      secs * 1.0 / TM_MONTH);
 		return;
 	}
 	htmlf("<span class='age-years'>%.0f years</span>",
 	      secs * 1.0 / TM_YEAR);
 }
 
 void cgit_print_docstart(char *title, struct cacheitem *item)
 {
 	html("Content-Type: text/html; charset=utf-8\n");
 	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
 	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
 					 ttl_seconds(item->ttl)));
 	html("\n");
 	html(cgit_doctype);
 	html("<html>\n");
 	html("<head>\n");
 	html("<title>");
 	html_txt(title);
 	html("</title>\n");
 	htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
 	html("<link rel='stylesheet' type='text/css' href='");
 	html_attr(cgit_css);
 	html("'/>\n");
 	html("</head>\n");
 	html("<body>\n");
 }
 
 void cgit_print_docend()
 {
 	html("</td></tr></table>");
 	html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
 	html("<table id='layout'>");
 	html("<tr><td id='header'>");
 	html(cgit_root_title);
 	html("</td><td id='logo'>");
 	html("<a href='");
 	html_attr(cgit_logo_link);
 	htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
 	html("</td></tr>");
 	html("<tr><td id='crumb'>");
 	htmlf("<a href='%s'>root</a>", cgit_rooturl());
 	if (cgit_query_repo) {
 		htmlf(" : <a href='%s'>", cgit_repourl(cgit_repo->url));
 		html_txt(cgit_repo->name);
 		htmlf("</a> : %s", title);
 	}
 	html("</td>");
 	html("<td id='search'>");
 	if (show_search) {
 		html("<form method='get' action='");
 		html_attr(cgit_currurl());
 		html("'>");
 		if (!cgit_virtual_root) {
 			if (cgit_query_repo)
 				html_hidden("r", cgit_query_repo);
 			if (cgit_query_page)
 				html_hidden("p", cgit_query_page);
 		}
 		if (cgit_query_head)
 			html_hidden("h", cgit_query_head);
 		if (cgit_query_sha1)
 			html_hidden("id", cgit_query_sha1);
 		if (cgit_query_sha2)
 			html_hidden("id2", cgit_query_sha2);
 		html("<input type='text' name='q' value='");
 		html_attr(cgit_query_search);
 		html("'/></form>");
 	}
 	html("</td></tr>");
 	html("<tr><td id='content' colspan='2'>");
 }
 
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
 			       struct cacheitem *item)
 {
 	htmlf("Content-Type: %s\n", mimetype);
 	htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
 	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
 	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
 					 ttl_seconds(item->ttl)));
 	html("\n");
 }
diff --git a/ui-summary.c b/ui-summary.c
index 18608b8..15e8aec 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,212 +1,212 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int header;
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 				int flags, void *cb_data)
 {
 	struct commit *commit;
 	struct commitinfo *info;
 	char buf[256], *url;
 
 	strncpy(buf, refname, sizeof(buf));
 	commit = lookup_commit(sha1);
 	if (commit && !parse_commit(commit)){
 		info = cgit_parse_commit(commit);
 		html("<tr><td>");
 		url = cgit_pageurl(cgit_query_repo, "log",
 				   fmt("h=%s", refname));
 		html_link_open(url, NULL, NULL);
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
 		cgit_print_age(commit->date, -1, NULL);
 		html("</td><td>");
 		html_txt(info->author);
 		html("</td><td>");
 		url = cgit_pageurl(cgit_query_repo, "commit",
 				   fmt("h=%s", sha1_to_hex(sha1)));
 		html_link_open(url, NULL, NULL);
 		html_ntxt(cgit_max_msg_len, info->subject);
 		html_link_close();
 		html("</td></tr>\n");
 		cgit_free_commitinfo(info);
 	} else {
 		html("<tr><td>");
 		html_txt(buf);
 		html("</td><td colspan='3'>");
 		htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
 		html("</td></tr>\n");
 	}
 	return 0;
 }
 
 
 static void cgit_print_object_ref(struct object *obj)
 {
 	char *page, *arg, *url;
 
 	if (obj->type == OBJ_COMMIT) {
 		page = "commit";
 		arg = "h";
 	} else if (obj->type == OBJ_TREE) {
 		page = "tree";
 		arg = "id";
 	} else {
 		page = "view";
 		arg = "id";
 	}
 
 	url = cgit_pageurl(cgit_query_repo, page,
 			   fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
 	html_link_open(url, NULL, NULL);
 	htmlf("%s %s", typename(obj->type),
 	      sha1_to_hex(obj->sha1));
 	html_link_close();
 }
 
 static void print_tag_header()
 {
 	html("<tr class='nohover'><th class='left'>Tag</th>"
 	     "<th class='left'>Age</th>"
 	     "<th class='left'>Author</th>"
 	     "<th class='left'>Reference</th></tr>\n");
 	header = 1;
 }
 
 static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1,
 				int flags, void *cb_data)
 {
 	struct tag *tag;
 	struct taginfo *info;
 	struct object *obj;
 	char buf[256], *url;
 
 	strncpy(buf, refname, sizeof(buf));
 	obj = parse_object(sha1);
 	if (!obj)
 		return 1;
 	if (obj->type == OBJ_TAG) {
 		tag = lookup_tag(sha1);
 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
 			return 2;
 		if (!header)
 			print_tag_header();
 		html("<tr><td>");
 		url = cgit_pageurl(cgit_query_repo, "view",
 				   fmt("id=%s", sha1_to_hex(sha1)));
 		html_link_open(url, NULL, NULL);
 		html_txt(buf);
 		html_link_close();
 		html("</td><td>");
 		if (info->tagger_date > 0)
 			cgit_print_age(info->tagger_date, -1, NULL);
 		html("</td><td>");
 		if (info->tagger)
 			html(info->tagger);
 		html("</td><td>");
 		cgit_print_object_ref(tag->tagged);
 		html("</td></tr>\n");
 	} else {
 		if (!header)
 			print_tag_header();
 		html("<tr><td>");
 		html_txt(buf);
 		html("</td><td colspan='2'/><td>");
 		cgit_print_object_ref(obj);
 		html("</td></tr>\n");
 	}
 	return 0;
 }
 
 static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
 				 int flags, void *cb_data)
 {
 	struct tag *tag;
 	struct taginfo *info;
 	struct object *obj;
 	char buf[256], *url;
 	unsigned char fileid[20];
 
 	if (prefixcmp(refname, "refs/archives"))
 		return 0;
 	strncpy(buf, refname+14, sizeof(buf));
 	obj = parse_object(sha1);
 	if (!obj)
 		return 1;
 	if (obj->type == OBJ_TAG) {
 		tag = lookup_tag(sha1);
 		if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
 			return 0;
 		hashcpy(fileid, tag->tagged->sha1);
 	} else if (obj->type != OBJ_BLOB) {
 		return 0;
 	} else {
 		hashcpy(fileid, sha1);
 	}
 	if (!header) {
 		html("<table id='downloads'>");
 		html("<tr><th>Downloads</th></tr>");
 		header = 1;
 	}
 	html("<tr><td>");
 	url = cgit_pageurl(cgit_query_repo, "blob",
-			   fmt("id=%s&path=%s", sha1_to_hex(fileid),
+			   fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
 			       buf));
 	html_link_open(url, NULL, NULL);
 	html_txt(buf);
 	html_link_close();
 	html("</td></tr>");
 	return 0;
 }
 
 static void cgit_print_branches()
 {
 	html("<tr class='nohover'><th class='left'>Branch</th>"
 	     "<th class='left'>Idle</th>"
 	     "<th class='left'>Author</th>"
 	     "<th class='left'>Head commit</th></tr>\n");
 	for_each_branch_ref(cgit_print_branch_cb, NULL);
 }
 
 static void cgit_print_tags()
 {
 	header = 0;
 	for_each_tag_ref(cgit_print_tag_cb, NULL);
 }
 
 static void cgit_print_archives()
 {
 	header = 0;
 	for_each_ref(cgit_print_archive_cb, NULL);
 	if (header)
 		html("</table>");
 }
 
 void cgit_print_summary()
 {
 	html("<div id='summary'>");
 	cgit_print_archives();
 	html("<h2>");
 	html_txt(cgit_repo->name);
 	html(" - ");
 	html_txt(cgit_repo->desc);
 	html("</h2>");
 	if (cgit_repo->readme)
 		html_include(cgit_repo->readme);
 	html("</div>");
 
 	html("<table class='list nowrap'>");
 	cgit_print_branches();
 	html("<tr class='nohover'><td colspan='4'>&nbsp;</td></tr>");
 	cgit_print_tags();
 	html("</table>");
 }
diff --git a/ui-tree.c b/ui-tree.c
index 006ca47..cb57d8d 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,104 +1,104 @@
 /* ui-tree.c: functions for tree output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 char *curr_rev;
 
 static int print_entry(const unsigned char *sha1, const char *base,
 		       int baselen, const char *pathname, unsigned int mode,
 		       int stage)
 {
 	char *name;
 	enum object_type type;
 	unsigned long size = 0;
 
 	name = xstrdup(pathname);
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
 		htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
 		      name,
 		      sha1_to_hex(sha1));
 		return 0;
 	}
 	html("<tr><td class='filemode'>");
 	html_filemode(mode);
 	html("</td><td ");
 	if (S_ISDIRLNK(mode)) {
 		htmlf("class='ls-mod'><a href='");
 		html_attr(fmt(cgit_repo->module_link,
 			      name,
 			      sha1_to_hex(sha1)));
 	} else if (S_ISDIR(mode)) {
 		html("class='ls-dir'><a href='");
 		html_attr(cgit_pageurl(cgit_query_repo, "tree",
-				       fmt("h=%s&id=%s&path=%s%s/",
+				       fmt("h=%s&amp;id=%s&amp;path=%s%s/",
 					   curr_rev,
 					   sha1_to_hex(sha1),
 					   cgit_query_path ? cgit_query_path : "",
 					   pathname)));
 	} else {
 		html("class='ls-blob'><a href='");
 		html_attr(cgit_pageurl(cgit_query_repo, "view",
-				      fmt("h=%s&id=%s&path=%s%s", curr_rev,
+				      fmt("h=%s&amp;id=%s&amp;path=%s%s", curr_rev,
 					  sha1_to_hex(sha1),
 					  cgit_query_path ? cgit_query_path : "",
 					  pathname)));
 	}
 	htmlf("'>%s</a></td>", name);
 	htmlf("<td class='filesize'>%li</td>", size);
 
 	html("<td class='links'><a href='");
 	html_attr(cgit_pageurl(cgit_query_repo, "log",
-			       fmt("h=%s&path=%s%s",
+			       fmt("h=%s&amp;path=%s%s",
 				   curr_rev,
 				   cgit_query_path ? cgit_query_path : "",
 				   pathname)));
 	html("'>history</a></td>");
 	html("</tr>\n");
 	free(name);
 	return 0;
 }
 
 void cgit_print_tree(const char *rev, const char *hex, char *path)
 {
 	struct tree *tree;
 	unsigned char sha1[20];
 	struct commit *commit;
 
 	curr_rev = xstrdup(rev);
 	get_sha1(rev, sha1);
 	commit = lookup_commit_reference(sha1);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error(fmt("Invalid head: %s", rev));
 		return;
 	}
 	if (!hex)
 		hex = sha1_to_hex(commit->tree->object.sha1);
 
 	if (get_sha1_hex(hex, sha1)) {
 		cgit_print_error(fmt("Invalid object id: %s", hex));
 		return;
 	}
 	tree = parse_tree_indirect(sha1);
 	if (!tree) {
 		cgit_print_error(fmt("Not a tree object: %s", hex));
 		return;
 	}
 
 	html_txt(path);
 	html("<table class='list'>\n");
 	html("<tr class='nohover'>");
 	html("<th class='left'>Mode</th>");
 	html("<th class='left'>Name</th>");
 	html("<th class='right'>Size</th>");
 	html("<th/>");
 	html("</tr>\n");
 	read_tree_recursive(tree, "", 0, 1, NULL, print_entry);
 	html("</table>\n");
 }
diff --git a/ui-view.c b/ui-view.c
index dbe4b29..8873415 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -1,55 +1,55 @@
 /* ui-view.c: functions to output _any_ object, given it's sha1
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 void cgit_print_view(const char *hex, char *path)
 {
 	unsigned char sha1[20];
 	enum object_type type;
 	unsigned char *buf;
 	unsigned long size;
 
 	if (get_sha1_hex(hex, sha1)){
 		cgit_print_error(fmt("Bad hex value: %s", hex));
 	        return;
 	}
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {
 		cgit_print_error(fmt("Bad object name: %s", hex));
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
 		cgit_print_error(fmt("Error reading object %s", hex));
 		return;
 	}
 
 	buf[size] = '\0';
 	html("<table class='list'>\n");
 	html("<tr class='nohover'><th class='left'>");
 	if (path)
 		htmlf("%s (", path);
 	htmlf("%s %s, %li bytes", typename(type), hex, size);
 	if (path)
 		html(")");
 
 	html(" <a href='");
 	html_attr(cgit_pageurl(cgit_query_repo, "blob", 
-			       fmt("id=%s&path=%s", 
+			       fmt("id=%s&amp;path=%s", 
 				   hex,
 				   path)));
 	html("'>download</a>");
 	html("</th></tr>\n");
 	html("<tr><td class='blob'>\n");
 	html_txt(buf);
 	html("\n</td></tr>\n");
 	html("</table>\n");
 }