itDitch <p> and <pre> tags. Improve menu formatting - 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 c0fb38b06388606d2e946528858a523b0cd0a280	/scm/phroxy/commit/c0fb38b06388606d2e946528858a523b0cd0a280.gph	z3bra.org	70
1parent 3f1b87eb0e31a6f42bef4f4673ced6e446a2b335	/scm/phroxy/commit/3f1b87eb0e31a6f42bef4f4673ced6e446a2b335.gph	z3bra.org	70
hAuthor: Willy Goiffon <dev@z3bra.org>	URL:mailto:dev@z3bra.org	z3bra.org	70
iDate:   Thu, 24 Sep 2020 10:23:18 +0200	Err	z3bra.org	70
i	Err	z3bra.org	70
iDitch <p> and <pre> tags. Improve menu formatting	Err	z3bra.org	70
i	Err	z3bra.org	70
iDiffstat:	Err	z3bra.org	70
i  M phroxy.c                            |      22 ++++++++--------------	Err	z3bra.org	70
i	Err	z3bra.org	70
i1 file changed, 8 insertions(+), 14 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@@ -232,8 +232,8 @@ int	Err	z3bra.org	70
i printmenu(int fd, char *data)	Err	z3bra.org	70
i {	Err	z3bra.org	70
i         char i, *p, a[LINE_MAX], *f[4];	Err	z3bra.org	70
i-        char *ifmt = "%s\n";	Err	z3bra.org	70
i-        char *afmt = "<a href='http://%s/%s:%s/%c%s'>%s (%s)</a>\n";	Err	z3bra.org	70
i+        char *ifmt = "<div class='item'><span></span><pre>%s</pre></div>\n";	Err	z3bra.org	70
i+        char *afmt = "<div class='item'><span>%s</span><a href='http://%s/%s:%s/%c%s'><pre>%s</pre></a></div>\n";	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         p = data;	Err	z3bra.org	70
i 	Err	z3bra.org	70
it@@ -253,7 +253,7 @@ printmenu(int fd, char *data)	Err	z3bra.org	70
i                         snprintf(a, sizeof(a), ifmt, f[0]);	Err	z3bra.org	70
i                         break;	Err	z3bra.org	70
i                 default:	Err	z3bra.org	70
i-                        snprintf(a, sizeof(a), afmt, http_host, f[2], f[3], i, f[1], f[0], itemname(i));	Err	z3bra.org	70
i+                        snprintf(a, sizeof(a), afmt, itemname(i), http_host, f[2], f[3], i, f[1], f[0]);	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i                 write(fd, a, strlen(a));	Err	z3bra.org	70
it@@ -270,25 +270,19 @@ printhtml(int fd, const char *data, size_t len)	Err	z3bra.org	70
i         const char *s, *e;	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         n = 0;	Err	z3bra.org	70
i+        write(fd, "<pre>", 5);	Err	z3bra.org	70
i         while(n < len) {	Err	z3bra.org	70
i                 s = data + n;	Err	z3bra.org	70
i                 e = strstr(s, "\n\n");	Err	z3bra.org	70
i-                r = e ? (size_t)(e - s) : strlen(s);	Err	z3bra.org	70
i+                r = e ? (size_t)(e - s + 2) : strlen(s);	Err	z3bra.org	70
i+                n += r;	Err	z3bra.org	70
i 	Err	z3bra.org	70
i                 if (!r)	Err	z3bra.org	70
i                         break;	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-                n += r + 2; /* go past "\n\n" */	Err	z3bra.org	70
i-                if (strstr(s, "   ") && strstr(s, "   ") < e) {	Err	z3bra.org	70
i-                        write(fd, "<pre>", 5);	Err	z3bra.org	70
i-                        write(fd, s, r);	Err	z3bra.org	70
i-                        write(fd, "</pre>\n", 7);	Err	z3bra.org	70
i-                } else {	Err	z3bra.org	70
i-                        write(fd, "<p>", 3);	Err	z3bra.org	70
i-                        write(fd, s, r);	Err	z3bra.org	70
i-                        write(fd, "</p>\n", 5);	Err	z3bra.org	70
i-                }	Err	z3bra.org	70
i+                write(fd, s, r);	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i+        write(fd, "</pre>\n", 7);	Err	z3bra.org	70
i         return 0;	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
.