Merge branch 'lh/escape-urls'

* lh/escape-urls:
  ui-shared.c: use html_url_arg()
  html.c: add html_url_arg

1 files changed, 10 insertions, 10 deletions

diff --git a/ui-shared.c b/ui-shared.c
index c23bc75..a2f636c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -223,3 +223,3 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html("?url=");
-		html_attr(ctx.repo->url);
+		html_url_arg(ctx.repo->url);
 		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
@@ -227,6 +227,6 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		if (page) {
-			html(page);
+			html_url_arg(page);
 			html("/");
 			if (path)
-				html_attr(path);
+				html_url_arg(path);
 		}
@@ -237,3 +237,3 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html("h=");
-		html_attr(head);
+		html_url_arg(head);
 		delim = "&";
@@ -252,3 +252,3 @@ static void reporevlink(char *page, char *name, char *title, char *class,
 		html("id=");
-		html_attr(rev);
+		html_url_arg(rev);
 	}
@@ -280,3 +280,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("id=");
-		html_attr(rev);
+		html_url_arg(rev);
 		delim = "&";
@@ -286,3 +286,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("qt=");
-		html_attr(grep);
+		html_url_arg(grep);
 		delim = "&";
@@ -290,3 +290,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("q=");
-		html_attr(pattern);
+		html_url_arg(pattern);
 	}
@@ -335,3 +335,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 		html("id=");
-		html_attr(new_rev);
+		html_url_arg(new_rev);
 		delim = "&";
@@ -341,3 +341,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 		html("id2=");
-		html_attr(old_rev);
+		html_url_arg(old_rev);
 	}