summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-04-07 14:40:50 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-04-08 16:10:11 +0200
commitfd00d2f9d6088223f57006949dc6ce7c36316a79 (patch)
tree46092821a261964a35b36f0e22b924fdd144bf75
parent57d09bf448990b3a67436e928807e854e491756f (diff)
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 <john@keeping.me.uk>
-rw-r--r--cgit.h3
-rw-r--r--html.c53
-rw-r--r--html.h11
3 files changed, 63 insertions, 4 deletions
diff --git a/cgit.h b/cgit.h
index 7581cc1..7619cbb 100644
--- a/cgit.h
+++ b/cgit.h
@@ -327,6 +327,9 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn,
__attribute__((format (printf,1,2)))
extern char *fmt(const char *format,...);
+__attribute__((format (printf,1,2)))
+extern char *fmtalloc(const char *format,...);
+
extern struct commitinfo *cgit_parse_commit(struct commit *commit);
extern struct taginfo *cgit_parse_tag(struct tag *tag);
extern void cgit_parse_url(const char *url);
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;
diff --git a/html.h b/html.h
index bb36f37..be3b311 100644
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
#ifndef HTML_H
#define HTML_H
-#include <stddef.h>
+#include "cgit.h"
extern void html_raw(const char *txt, size_t size);
extern void html(const char *txt);
@@ -9,6 +9,15 @@ extern void html(const char *txt);
__attribute__((format (printf,1,2)))
extern void htmlf(const char *format,...);
+__attribute__((format (printf,1,2)))
+extern void html_txtf(const char *format,...);
+
+__attribute__((format (printf,1,0)))
+extern void html_vtxtf(const char *format, va_list ap);
+
+__attribute__((format (printf,1,2)))
+extern void html_attrf(const char *format,...);
+
extern void html_status(int code, const char *msg, int more_headers);
extern void html_txt(const char *txt);
extern void html_ntxt(int len, const char *txt);