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>

diff --git a/cgit.h b/cgit.h
index 7581cc1a053888c57f24f31735c82fe4cd5412e4..7619cbb22f22d4a24e37448429778980d45e930c 100644 (file)
--- 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 *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);
 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 8c45ba69daa1482456172281850b29689152581a..f7772dce1c3284c61e0c4a93dc06e533b85574aa 100644 (file)
--- a/html.c
+++ b/html.c
@@ -63,6 +63,18 @@ char *fmt(const char *format, ...)
        return buf[bufidx];
 }
 
        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)
 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, ...)
 {
 
 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);
        va_list args;
 
        va_start(args, format);

-       vsnprintf(buf, sizeof(buf), format, args);
+       html_vtxtf(format, args);

        va_end(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)
 }
 
 void html_status(int code, const char *msg, int more_headers)


@@ -136,6 +170,19 @@ void html_ntxt(int len, const char *txt)
                html("...");
 }
 
                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;
 void html_attr(const char *txt)
 {
        const char *t = txt;

diff --git a/html.h b/html.h
index bb36f37689496d07d2abf1499270c2a638adb5c0..be3b3112c100dcbf79bf46151cd3fc747e80b48e 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,7 +1,7 @@
 #ifndef HTML_H
 #define HTML_H
 
 #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);
 
 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 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);
 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);