From fd00d2f9d6088223f57006949dc6ce7c36316a79 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sun, 7 Apr 2013 14:40:50 +0100 Subject: html.c: add various strbuf and varadic helpers This adds the fmtalloc helper, html_txtf, html_vtxtf, and html_attrf. These takes a printf style format string like htmlf but escapes the resulting string. The html_vtxtf variant takes a va_list whereas html_txtf is variadic. Signed-off-by: John Keeping --- html.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) (limited to 'html.c') diff --git a/html.c b/html.c index 8c45ba6..f7772dc 100644 --- a/html.c +++ b/html.c @@ -63,6 +63,18 @@ 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) { if (write(htmlfd, data, size) != size) @@ -76,13 +88,35 @@ void html(const char *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) @@ -136,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; -- cgit v1.2.3-24-g4f1b