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

diff --git a/html.c b/html.c
index b5c6903..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>
@@ -61,25 +63,60 @@ char *fmt(const char *format, ...)
 	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);
+	strbuf_vaddf(&buf, format, args);
+	va_end(args);
+	html(buf.buf);
+	strbuf_release(&buf);
+}
+
+void html_txtf(const char *format, ...)
+{
 	va_list args;
 
 	va_start(args, format);
-	vsnprintf(buf, sizeof(buf), format, args);
+	html_vtxtf(format, args);
 	va_end(args);
-	html(buf);
+}
+
+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)
@@ -133,6 +170,19 @@ void html_ntxt(int len, const char *txt)
 		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;
@@ -305,11 +355,7 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
 	if (!txt_)
 		return 0;
 
-	o = t = txt = strdup(txt_);
-	if (t == NULL) {
-		printf("Out of memory\n");
-		exit(1);
-	}
+	o = t = txt = xstrdup(txt_);
 	while ((c=*t) != '\0') {
 		if (c == '=') {
 			*t = '\0';