From 1663adbf565f57236617ab227431dd95132d6c9c Mon Sep 17 00:00:00 2001 From: default Date: Mon, 27 Nov 2023 10:19:01 +0100 Subject: [PATCH] Backport from xs. --- html.c | 2 +- xs_html.h | 43 +++++++++++++++++++++++++++++++------------ xs_version.h | 2 +- 3 files changed, 33 insertions(+), 14 deletions(-) diff --git a/html.c b/html.c index 2c40d70..1bbd153 100644 --- a/html.c +++ b/html.c @@ -2382,7 +2382,7 @@ int html_get_handler(const xs_dict *req, const char *q_path, xs_html_text(content)))); } - *body = xs_html_render_s(rss, xs_dup("\n")); + *body = xs_html_render_s(rss, "\n"); *b_size = strlen(*body); *ctype = "application/rss+xml; charset=utf-8"; status = 200; diff --git a/xs_html.h b/xs_html.h index e9e251e..16ee5ec 100644 --- a/xs_html.h +++ b/xs_html.h @@ -21,8 +21,10 @@ xs_html *_xs_html_tag(char *tag, xs_html *var[]); xs_html *_xs_html_sctag(char *tag, xs_html *var[]); #define xs_html_sctag(tag, ...) _xs_html_sctag(tag, (xs_html *[]) { __VA_ARGS__, NULL }) -xs_str *xs_html_render_s(xs_html *h, xs_str *s); -#define xs_html_render(h) xs_html_render_s(h, xs_str_new(NULL)) +void xs_html_render_f(xs_html *h, FILE *f); +xs_str *xs_html_render_s(xs_html *tag, char *prefix); +#define xs_html_render(tag) xs_html_render_s(tag, NULL) + #ifdef XS_IMPLEMENTATION @@ -187,55 +189,72 @@ xs_html *_xs_html_sctag(char *tag, xs_html *var[]) } -xs_str *xs_html_render_s(xs_html *h, xs_str *s) -/* renders the tag and its subtags into s */ +void xs_html_render_f(xs_html *h, FILE *f) +/* renders the tag and its subtags into a file */ { xs_html *st; switch (h->type) { case XS_HTML_TAG: case XS_HTML_SCTAG: - s = xs_str_cat(s, "<", h->content); + fprintf(f, "<%s", h->content); /* render the attributes */ st = h->f_attr; while (st) { xs_html *nst = st->next; - s = xs_html_render_s(st, s); + xs_html_render_f(st, f); st = nst; } if (h->type == XS_HTML_SCTAG) { /* self-closing tags should not have subtags */ - s = xs_str_cat(s, "/>\n"); + fprintf(f, "/>"); } else { - s = xs_str_cat(s, ">"); + fprintf(f, ">"); /* render the subtags */ st = h->f_tag; while (st) { xs_html *nst = st->next; - s = xs_html_render_s(st, s); + xs_html_render_f(st, f); st = nst; } - s = xs_str_cat(s, "content, ">"); + fprintf(f, "", h->content); } break; case XS_HTML_ATTR: - s = xs_str_cat(s, " ", h->content); + fprintf(f, " %s", h->content); break; case XS_HTML_TEXT: - s = xs_str_cat(s, h->content); + fprintf(f, "%s", h->content); break; } xs_free(h->content); xs_free(h); +} + + +xs_str *xs_html_render_s(xs_html *tag, char *prefix) +/* renders to a string */ +{ + xs_str *s = NULL; + size_t sz; + FILE *f; + + if ((f = open_memstream(&s, &sz)) != NULL) { + if (prefix) + fprintf(f, "%s", prefix); + + xs_html_render_f(tag, f); + fclose(f); + } return s; } diff --git a/xs_version.h b/xs_version.h index b9ac423..02fd9b7 100644 --- a/xs_version.h +++ b/xs_version.h @@ -1 +1 @@ -/* 0e2c549f2ac6f4840649332097dc8471a3939cef 2023-11-26T16:44:32+01:00 */ +/* ba85b6a3e2332fc51d12a5f9dc5ecbd5f5cc1555 2023-11-27T10:00:17+01:00 */