Merge branch 'lh/escape-urls'

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

1 file changed, 16 insertions, 0 deletions

diff --git a/html.c b/html.cindex 36e9a2fa..167127f3 100644--- a/html.c+++ b/html.c@@ -128,6 +128,22 @@ void html_attr(char *txt) 		html(txt); } +void html_url_arg(char *txt)+{+	char *t = txt;+	while(t && *t){+		int c = *t;+		if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {+			write(htmlfd, txt, t - txt);+			write(htmlfd, fmt("%%%2x", c), 3);+			txt = t+1;+		}+		t++;+	}+	if (t!=txt)+		html(txt);+}+ void html_hidden(char *name, char *value) { 	html("<input type='hidden' name='");
diff --git a/html.c b/html.c
index 36e9a2fa..167127f3 100644
--- a/html.c
+++ b/html.c
@@ -128,6 +128,22 @@ void html_attr(char *txt)
 		html(txt);
 }
 
+void html_url_arg(char *txt)
+{
+	char *t = txt;
+	while(t && *t){
+		int c = *t;
+		if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
+			write(htmlfd, txt, t - txt);
+			write(htmlfd, fmt("%%%2x", c), 3);
+			txt = t+1;
+		}
+		t++;
+	}
+	if (t!=txt)
+		html(txt);
+}
+
 void html_hidden(char *name, char *value)
 {
 	html("<input type='hidden' name='");