X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c2680325f68192368d32f26458fea9cfb50df6e5..181b6e789b79fc385e5ec75b2b83f01192d54051:/html.c

diff --git a/html.c b/html.c
index a1fe87d..8f6e4f6 100644
--- a/html.c
+++ b/html.c
@@ -18,7 +18,7 @@ static const char* url_escape_table[256] = {
 	"%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
 	"%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
 	"%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
-	"%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
+	"%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
 	"%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
 	"%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
@@ -138,7 +138,7 @@ void html_attr(const char *txt)
 	const char *t = txt;
 	while(t && *t){
 		int c = *t;
-		if (c=='<' || c=='>' || c=='\'' || c=='\"') {
+		if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') {
 			html_raw(txt, t - txt);
 			if (c=='>')
 				html("&gt;");
@@ -148,6 +148,8 @@ void html_attr(const char *txt)
 				html("&#x27;");
 			else if (c=='"')
 				html("&quot;");
+			else if (c=='&')
+				html("&amp;");
 			txt = t+1;
 		}
 		t++;
@@ -160,11 +162,11 @@ void html_url_path(const char *txt)
 {
 	const char *t = txt;
 	while(t && *t){
-		int c = *t;
+		unsigned char c = *t;
 		const char *e = url_escape_table[c];
-		if (e && c!='+' && c!='&' && c!='+') {
+		if (e && c!='+' && c!='&') {
 			html_raw(txt, t - txt);
-			html_raw(e, 3);
+			html(e);
 			txt = t+1;
 		}
 		t++;
@@ -177,11 +179,13 @@ void html_url_arg(const char *txt)
 {
 	const char *t = txt;
 	while(t && *t){
-		int c = *t;
+		unsigned char c = *t;
 		const char *e = url_escape_table[c];
+		if (c == ' ')
+			e = "+";
 		if (e) {
 			html_raw(txt, t - txt);
-			html_raw(e, strlen(e));
+			html(e);
 			txt = t+1;
 		}
 		t++;
@@ -211,6 +215,14 @@ void html_option(const char *value, const char *text, const char *selected_value
 	html("</option>\n");
 }
 
+void html_intoption(int value, const char *text, int selected_value)
+{
+	htmlf("<option value='%d'%s>", value,
+	      value == selected_value ? " selected='selected'" : "");
+	html_txt(text);
+	html("</option>");
+}
+
 void html_link_open(const char *url, const char *title, const char *class)
 {
 	html("<a href='");
@@ -277,7 +289,7 @@ char *convert_query_hexchar(char *txt)
 	d1 = hextoint(*(txt+1));
 	d2 = hextoint(*(txt+2));
 	if (d1<0 || d2<0) {
-		memmove(txt, txt+3, n-3);
+		memmove(txt, txt+3, n-2);
 		return txt-1;
 	} else {
 		*txt = d1 * 16 + d2;
@@ -288,12 +300,12 @@ char *convert_query_hexchar(char *txt)
 
 int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
 {
-	char *t, *txt, *value = NULL, c;
+	char *o, *t, *txt, *value = NULL, c;
 
 	if (!txt_)
 		return 0;
 
-	t = txt = strdup(txt_);
+	o = t = txt = strdup(txt_);
 	if (t == NULL) {
 		printf("Out of memory\n");
 		exit(1);
@@ -316,5 +328,6 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
 	}
 	if (t!=txt)
 		(*fn)(txt, value);
+	free(o);
 	return 0;
 }