3 files changed, 12 insertions, 12 deletions
diff --git a/html.c b/html.c
index eaabf72..1305910 100644
--- a/html.c
+++ b/html.c

@@ -95,7 +95,7 @@ void html_txt(const char *txt)
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
@@ -116,7 +116,7 @@ void html_ntxt(int len, const char *txt)
        while(t && *t && len--){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
@@ -128,7 +128,7 @@ void html_ntxt(int len, const char *txt)
                t++;
        }
        if (t!=txt)
-                write(htmlfd, txt, t - txt);
+                html_raw(txt, t - txt);
        if (len<0)
                html("...");
 }
@@ -139,7 +139,7 @@ void html_attr(const char *txt)
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='\'' || c=='\"') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
@@ -163,8 +163,8 @@ void html_url_path(const char *txt)
                int c = *t;
                const char *e = url_escape_table[c];
                if (e && c!='+' && c!='&' && c!='+') {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
-                        write(htmlfd, e, 3);
+                        html_raw(e, 3);
                        txt = t+1;
                }
                t++;
@@ -180,8 +180,8 @@ void html_url_arg(const char *txt)
                int c = *t;
                const char *e = url_escape_table[c];
                if (e) {
-                        write(htmlfd, txt, t - txt);
+                        html_raw(txt, t - txt);
-                        write(htmlfd, e, 3);
+                        html_raw(e, 3);
                        txt = t+1;
                }
                t++;
@@ -249,7 +249,7 @@ int html_include(const char *filename)
                return -1;
        }
        while((len = fread(buf, 1, 4096, f)) > 0)
-                write(htmlfd, buf, len);
+                html_raw(buf, len);
        fclose(f);
        return 0;
 }
diff --git a/ui-blob.c b/ui-blob.c
index 667a451..ec435e1 100644
--- a/ui-blob.c
+++ b/ui-blob.c

@@ -52,7 +52,7 @@ int cgit_print_file(char *path, const char *head)
        if (!buf)
                return -1;
        buf[size] = '\0';
-        write(htmlfd, buf, size);
+        html_raw(buf, size);
        return 0;
 }
@@ -108,5 +108,5 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
        }
        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);
-        write(htmlfd, buf, size);
+        html_raw(buf, size);
 }
diff --git a/ui-tree.c b/ui-tree.c
index 0cdbf6d..0b1b531 100644
--- a/ui-tree.c
+++ b/ui-tree.c

@@ -46,7 +46,7 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                html("<td class='lines'><pre><code>");
                ctx.repo->source_filter->argv[1] = xstrdup(name);
                cgit_open_filter(ctx.repo->source_filter);
-                write(STDOUT_FILENO, buf, size);
+                html_raw(buf, size);
                cgit_close_filter(ctx.repo->source_filter);
                html("</code></pre></td></tr></table>\n");
                return;

diff --git a/html.c b/html.c index eaabf72..1305910 100644 --- a/html.c +++ b/html.c
@@ -95,7 +95,7 @@ void html_txt(const char *txt)
95	while(t && *t){	95	while(t && *t){
96	int c = *t;	96	int c = *t;
97	if (c=='<' \|\| c=='>' \|\| c=='&') {	97	if (c=='<' \|\| c=='>' \|\| c=='&') {
98	write(htmlfd, txt, t - txt);	98	html_raw(txt, t - txt);
99	if (c=='>')	99	if (c=='>')
100	html(">");	100	html(">");
101	else if (c=='<')	101	else if (c=='<')
@@ -116,7 +116,7 @@ void html_ntxt(int len, const char *txt)
116	while(t && *t && len--){	116	while(t && *t && len--){
117	int c = *t;	117	int c = *t;
118	if (c=='<' \|\| c=='>' \|\| c=='&') {	118	if (c=='<' \|\| c=='>' \|\| c=='&') {
119	write(htmlfd, txt, t - txt);	119	html_raw(txt, t - txt);
120	if (c=='>')	120	if (c=='>')
121	html(">");	121	html(">");
122	else if (c=='<')	122	else if (c=='<')
@@ -128,7 +128,7 @@ void html_ntxt(int len, const char *txt)
128	t++;	128	t++;
129	}	129	}
130	if (t!=txt)	130	if (t!=txt)
131	write(htmlfd, txt, t - txt);	131	html_raw(txt, t - txt);
132	if (len<0)	132	if (len<0)
133	html("...");	133	html("...");
134	}	134	}
@@ -139,7 +139,7 @@ void html_attr(const char *txt)
139	while(t && *t){	139	while(t && *t){
140	int c = *t;	140	int c = *t;
141	if (c=='<' \|\| c=='>' \|\| c=='\'' \|\| c=='\"') {	141	if (c=='<' \|\| c=='>' \|\| c=='\'' \|\| c=='\"') {
142	write(htmlfd, txt, t - txt);	142	html_raw(txt, t - txt);
143	if (c=='>')	143	if (c=='>')
144	html(">");	144	html(">");
145	else if (c=='<')	145	else if (c=='<')
@@ -163,8 +163,8 @@ void html_url_path(const char *txt)
163	int c = *t;	163	int c = *t;
164	const char *e = url_escape_table[c];	164	const char *e = url_escape_table[c];
165	if (e && c!='+' && c!='&' && c!='+') {	165	if (e && c!='+' && c!='&' && c!='+') {
166	write(htmlfd, txt, t - txt);	166	html_raw(txt, t - txt);
167	write(htmlfd, e, 3);	167	html_raw(e, 3);
168	txt = t+1;	168	txt = t+1;
169	}	169	}
170	t++;	170	t++;
@@ -180,8 +180,8 @@ void html_url_arg(const char *txt)
180	int c = *t;	180	int c = *t;
181	const char *e = url_escape_table[c];	181	const char *e = url_escape_table[c];
182	if (e) {	182	if (e) {
183	write(htmlfd, txt, t - txt);	183	html_raw(txt, t - txt);
184	write(htmlfd, e, 3);	184	html_raw(e, 3);
185	txt = t+1;	185	txt = t+1;
186	}	186	}
187	t++;	187	t++;
@@ -249,7 +249,7 @@ int html_include(const char *filename)
249	return -1;	249	return -1;
250	}	250	}
251	while((len = fread(buf, 1, 4096, f)) > 0)	251	while((len = fread(buf, 1, 4096, f)) > 0)
252	write(htmlfd, buf, len);	252	html_raw(buf, len);
253	fclose(f);	253	fclose(f);
254	return 0;	254	return 0;
255	}	255	}


diff --git a/ui-blob.c b/ui-blob.c index 667a451..ec435e1 100644 --- a/ui-blob.c +++ b/ui-blob.c
@@ -52,7 +52,7 @@ int cgit_print_file(char path, const char head)
52	if (!buf)	52	if (!buf)
53	return -1;	53	return -1;
54	buf[size] = '\0';	54	buf[size] = '\0';
55	write(htmlfd, buf, size);	55	html_raw(buf, size);
56	return 0;	56	return 0;
57	}	57	}
58		58
@@ -108,5 +108,5 @@ void cgit_print_blob(const char hex, char path, const char *head)
108	}	108	}
109	ctx.page.filename = path;	109	ctx.page.filename = path;
110	cgit_print_http_headers(&ctx);	110	cgit_print_http_headers(&ctx);
111	write(htmlfd, buf, size);	111	html_raw(buf, size);
112	}	112	}


diff --git a/ui-tree.c b/ui-tree.c index 0cdbf6d..0b1b531 100644 --- a/ui-tree.c +++ b/ui-tree.c
@@ -46,7 +46,7 @@ static void print_text_buffer(const char name, char buf, unsigned long size)
46	html("<td class='lines'><pre><code>");	46	html("<td class='lines'><pre><code>");
47	ctx.repo->source_filter->argv[1] = xstrdup(name);	47	ctx.repo->source_filter->argv[1] = xstrdup(name);
48	cgit_open_filter(ctx.repo->source_filter);	48	cgit_open_filter(ctx.repo->source_filter);
49	write(STDOUT_FILENO, buf, size);	49	html_raw(buf, size);
50	cgit_close_filter(ctx.repo->source_filter);	50	cgit_close_filter(ctx.repo->source_filter);
51	html("</code></pre></td></tr></table>\n");	51	html("</code></pre></td></tr></table>\n");
52	return;	52	return;