itVarious fixes about presentation - phroxy - Gopher to HTTP proxy Err z3bra.org 70 hgit clone git://git.z3bra.org/phroxy.git URL:git://git.z3bra.org/phroxy.git z3bra.org 70 1Log /scm/phroxy/log.gph z3bra.org 70 1Files /scm/phroxy/files.gph z3bra.org 70 1Refs /scm/phroxy/refs.gph z3bra.org 70 1LICENSE /scm/phroxy/file/LICENSE.gph z3bra.org 70 i--- Err z3bra.org 70 1commit a44d2079ba256f02068daa7b153d9c87eb2e8160 /scm/phroxy/commit/a44d2079ba256f02068daa7b153d9c87eb2e8160.gph z3bra.org 70 1parent d521a7e51213a29de0e339b7bd9fb1bb04f227df /scm/phroxy/commit/d521a7e51213a29de0e339b7bd9fb1bb04f227df.gph z3bra.org 70 hAuthor: Willy Goiffon URL:mailto:dev@z3bra.org z3bra.org 70 iDate: Mon, 14 Sep 2020 11:24:01 +0200 Err z3bra.org 70 i Err z3bra.org 70 iVarious fixes about presentation Err z3bra.org 70 i Err z3bra.org 70 iDiffstat: Err z3bra.org 70 i M phroxy.c | 16 +++++++++------- Err z3bra.org 70 i Err z3bra.org 70 i1 file changed, 9 insertions(+), 7 deletions(-) Err z3bra.org 70 i--- Err z3bra.org 70 1diff --git a/phroxy.c b/phroxy.c /scm/phroxy/file/phroxy.c.gph z3bra.org 70 it@@ -180,6 +180,8 @@ contenttype(char i) Err z3bra.org 70 i { Err z3bra.org 70 i switch(i) { Err z3bra.org 70 i case '0': Err z3bra.org 70 i+ return "text/plain; charset=utf-8"; Err z3bra.org 70 i+ break; /* NOTREACHED */ Err z3bra.org 70 i case '1': Err z3bra.org 70 i return "text/html; charset=utf-8"; Err z3bra.org 70 i break; /* NOTREACHED */ Err z3bra.org 70 it@@ -207,12 +209,12 @@ printheaders(char *ctype) Err z3bra.org 70 i } Err z3bra.org 70 i Err z3bra.org 70 i char * Err z3bra.org 70 i-htmlize(char *data, size_t len, size_t *newsize) Err z3bra.org 70 i+htmlize(char *data, size_t *htmlsize) Err z3bra.org 70 i { Err z3bra.org 70 i size_t alen, blen, hlen; Err z3bra.org 70 i char *html = NULL; Err z3bra.org 70 i char i, *p, *body, a[LINE_MAX], *f[4]; Err z3bra.org 70 i- char *fmt = "%s
\n"; Err z3bra.org 70 i+ char *fmt = "%s
\n"; Err z3bra.org 70 i Err z3bra.org 70 i blen = 0; Err z3bra.org 70 i body = NULL; Err z3bra.org 70 it@@ -231,7 +233,7 @@ htmlize(char *data, size_t len, size_t *newsize) Err z3bra.org 70 i snprintf(a, sizeof(a), "%s
\n", f[0]); Err z3bra.org 70 i break; Err z3bra.org 70 i default: Err z3bra.org 70 i- snprintf(a, sizeof(a), fmt, f[2], f[3], i, f[1], f[0]); Err z3bra.org 70 i+ snprintf(a, sizeof(a), fmt, http_host, f[2], f[3], i, f[1], f[0]); Err z3bra.org 70 i } Err z3bra.org 70 i alen = strnlen(a, sizeof(a)); Err z3bra.org 70 i body = realloc(body, blen + alen); Err z3bra.org 70 it@@ -246,8 +248,8 @@ htmlize(char *data, size_t len, size_t *newsize) Err z3bra.org 70 i Err z3bra.org 70 i snprintf(html, hlen, htmlfmt, body); Err z3bra.org 70 i Err z3bra.org 70 i- if (newsize) Err z3bra.org 70 i- *newsize = hlen; Err z3bra.org 70 i+ if (htmlsize) Err z3bra.org 70 i+ *htmlsize = hlen; Err z3bra.org 70 i Err z3bra.org 70 i return html; Err z3bra.org 70 i } Err z3bra.org 70 it@@ -259,13 +261,13 @@ serveitem(char item, char *data, size_t len) Err z3bra.org 70 i int sent; Err z3bra.org 70 i Err z3bra.org 70 i switch(item) { Err z3bra.org 70 i- case '0': Err z3bra.org 70 i case '1': Err z3bra.org 70 i- html = htmlize(data, len, &len); Err z3bra.org 70 i+ html = htmlize(data, &len); Err z3bra.org 70 i free(data); Err z3bra.org 70 i data = html; Err z3bra.org 70 i break; Err z3bra.org 70 i Err z3bra.org 70 i+ case '0': Err z3bra.org 70 i case '6': Err z3bra.org 70 i case '9': Err z3bra.org 70 i case 'g': Err z3bra.org 70 .