X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/e66a16cebcdac53b63e77876acef1ca9e4877038..81bf4d32b377d3f2fdd7ab3ca651be99408f5c32:/html.c

diff --git a/html.c b/html.c
index a1fe87d..f7772dc 100644
--- a/html.c
+++ b/html.c
@@ -6,6 +6,8 @@
  *   (see COPYING for full license text)
  */
 
+#include "cgit.h"
+#include "html.h"
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,7 +20,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,
@@ -39,7 +41,7 @@ static const char* url_escape_table[256] = {
 	"%fe", "%ff"
 };
 
-int htmlfd = STDOUT_FILENO;
+static int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
 {
@@ -54,32 +56,67 @@ char *fmt(const char *format, ...)
 	va_start(args, format);
 	len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
 	va_end(args);
-	if (len>sizeof(buf[bufidx])) {
+	if (len > sizeof(buf[bufidx])) {
 		fprintf(stderr, "[html.c] string truncated: %s\n", format);
 		exit(1);
 	}
 	return buf[bufidx];
 }
 
+char *fmtalloc(const char *format, ...)
+{
+	struct strbuf sb = STRBUF_INIT;
+	va_list args;
+
+	va_start(args, format);
+	strbuf_vaddf(&sb, format, args);
+	va_end(args);
+
+	return strbuf_detach(&sb, NULL);
+}
+
 void html_raw(const char *data, size_t size)
 {
-	write(htmlfd, data, size);
+	if (write(htmlfd, data, size) != size)
+		fprintf(stderr, "[html.c] html output truncated.\n");
 }
 
 void html(const char *txt)
 {
-	write(htmlfd, txt, strlen(txt));
+	html_raw(txt, strlen(txt));
 }
 
 void htmlf(const char *format, ...)
 {
-	static char buf[65536];
 	va_list args;
+	struct strbuf buf = STRBUF_INIT;
 
 	va_start(args, format);
-	vsnprintf(buf, sizeof(buf), format, args);
+	strbuf_vaddf(&buf, format, args);
 	va_end(args);
-	html(buf);
+	html(buf.buf);
+	strbuf_release(&buf);
+}
+
+void html_txtf(const char *format, ...)
+{
+	va_list args;
+
+	va_start(args, format);
+	html_vtxtf(format, args);
+	va_end(args);
+}
+
+void html_vtxtf(const char *format, va_list ap)
+{
+	va_list cp;
+	struct strbuf buf = STRBUF_INIT;
+
+	va_copy(cp, ap);
+	strbuf_vaddf(&buf, format, cp);
+	va_end(cp);
+	html_txt(buf.buf);
+	strbuf_release(&buf);
 }
 
 void html_status(int code, const char *msg, int more_headers)
@@ -92,101 +129,118 @@ void html_status(int code, const char *msg, int more_headers)
 void html_txt(const char *txt)
 {
 	const char *t = txt;
-	while(t && *t){
+	while (t && *t) {
 		int c = *t;
-		if (c=='<' || c=='>' || c=='&') {
+		if (c == '<' || c == '>' || c == '&') {
 			html_raw(txt, t - txt);
-			if (c=='>')
+			if (c == '>')
 				html("&gt;");
-			else if (c=='<')
+			else if (c == '<')
 				html("&lt;");
-			else if (c=='&')
+			else if (c == '&')
 				html("&amp;");
-			txt = t+1;
+			txt = t + 1;
 		}
 		t++;
 	}
-	if (t!=txt)
+	if (t != txt)
 		html(txt);
 }
 
 void html_ntxt(int len, const char *txt)
 {
 	const char *t = txt;
-	while(t && *t && len--){
+	while (t && *t && len--) {
 		int c = *t;
-		if (c=='<' || c=='>' || c=='&') {
+		if (c == '<' || c == '>' || c == '&') {
 			html_raw(txt, t - txt);
-			if (c=='>')
+			if (c == '>')
 				html("&gt;");
-			else if (c=='<')
+			else if (c == '<')
 				html("&lt;");
-			else if (c=='&')
+			else if (c == '&')
 				html("&amp;");
-			txt = t+1;
+			txt = t + 1;
 		}
 		t++;
 	}
-	if (t!=txt)
+	if (t != txt)
 		html_raw(txt, t - txt);
-	if (len<0)
+	if (len < 0)
 		html("...");
 }
 
+void html_attrf(const char *fmt, ...)
+{
+	va_list ap;
+	struct strbuf sb = STRBUF_INIT;
+
+	va_start(ap, fmt);
+	strbuf_vaddf(&sb, fmt, ap);
+	va_end(ap);
+
+	html_attr(sb.buf);
+	strbuf_release(&sb);
+}
+
 void html_attr(const char *txt)
 {
 	const char *t = txt;
-	while(t && *t){
+	while (t && *t) {
 		int c = *t;
-		if (c=='<' || c=='>' || c=='\'' || c=='\"') {
+		if (c == '<' || c == '>' || c == '\'' || c == '\"' || c == '&') {
 			html_raw(txt, t - txt);
-			if (c=='>')
+			if (c == '>')
 				html("&gt;");
-			else if (c=='<')
+			else if (c == '<')
 				html("&lt;");
-			else if (c=='\'')
+			else if (c == '\'')
 				html("&#x27;");
-			else if (c=='"')
+			else if (c == '"')
 				html("&quot;");
-			txt = t+1;
+			else if (c == '&')
+				html("&amp;");
+			txt = t + 1;
 		}
 		t++;
 	}
-	if (t!=txt)
+	if (t != txt)
 		html(txt);
 }
 
 void html_url_path(const char *txt)
 {
 	const char *t = txt;
-	while(t && *t){
-		int c = *t;
+	while (t && *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);
-			txt = t+1;
+			html(e);
+			txt = t + 1;
 		}
 		t++;
 	}
-	if (t!=txt)
+	if (t != txt)
 		html(txt);
 }
 
 void html_url_arg(const char *txt)
 {
 	const char *t = txt;
-	while(t && *t){
-		int c = *t;
+	while (t && *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));
-			txt = t+1;
+			html(e);
+			txt = t + 1;
 		}
 		t++;
 	}
-	if (t!=txt)
+	if (t != txt)
 		html(txt);
 }
 
@@ -211,6 +265,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='");
@@ -248,13 +310,13 @@ int html_include(const char *filename)
 			filename, strerror(errno), errno);
 		return -1;
 	}
-	while((len = fread(buf, 1, 4096, f)) > 0)
+	while ((len = fread(buf, 1, 4096, f)) > 0)
 		html_raw(buf, len);
 	fclose(f);
 	return 0;
 }
 
-int hextoint(char c)
+static int hextoint(char c)
 {
 	if (c >= 'a' && c <= 'f')
 		return 10 + c - 'a';
@@ -266,7 +328,7 @@ int hextoint(char c)
 		return -1;
 }
 
-char *convert_query_hexchar(char *txt)
+static char *convert_query_hexchar(char *txt)
 {
 	int d1, d2, n;
 	n = strlen(txt);
@@ -274,47 +336,44 @@ char *convert_query_hexchar(char *txt)
 		*txt = '\0';
 		return txt-1;
 	}
-	d1 = hextoint(*(txt+1));
-	d2 = hextoint(*(txt+2));
-	if (d1<0 || d2<0) {
-		memmove(txt, txt+3, n-3);
+	d1 = hextoint(*(txt + 1));
+	d2 = hextoint(*(txt + 2));
+	if (d1 < 0 || d2 < 0) {
+		memmove(txt, txt + 3, n - 2);
 		return txt-1;
 	} else {
 		*txt = d1 * 16 + d2;
-		memmove(txt+1, txt+3, n-2);
+		memmove(txt + 1, txt + 3, n - 2);
 		return 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_);
-	if (t == NULL) {
-		printf("Out of memory\n");
-		exit(1);
-	}
-	while((c=*t) != '\0') {
-		if (c=='=') {
+	o = t = txt = xstrdup(txt_);
+	while ((c=*t) != '\0') {
+		if (c == '=') {
 			*t = '\0';
-			value = t+1;
-		} else if (c=='+') {
+			value = t + 1;
+		} else if (c == '+') {
 			*t = ' ';
-		} else if (c=='%') {
+		} else if (c == '%') {
 			t = convert_query_hexchar(t);
-		} else if (c=='&') {
+		} else if (c == '&') {
 			*t = '\0';
 			(*fn)(txt, value);
-			txt = t+1;
+			txt = t + 1;
 			value = NULL;
 		}
 		t++;
 	}
-	if (t!=txt)
+	if (t != txt)
 		(*fn)(txt, value);
+	free(o);
 	return 0;
 }