prefer html_raw() to write()

To make the code more consistent, and to not rely on the implementation
of html(), always use html_raw(...) instead of write(htmlfd, ...).

Signed-off-by: Mark Lodato <lodatom@gmail.com>

diff --git a/html.c b/html.c
index eaabf7274eca79c7f9391f50130ff82e99199879..1305910b40f9513ef11a0eda21fb6d6d06e11ae5 100644 (file)
--- 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);
-                       write(htmlfd, e, 3);
+                       html_raw(txt, t - txt);
+                       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);
-                       write(htmlfd, e, 3);
+                       html_raw(txt, t - txt);
+                       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 667a45111bf16c8fc7d8bf55303782f27ebd357a..ec435e1bc1c616b753b38a387ae27af31cc21c0d 100644 (file)
--- 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 0cdbf6db905344d649d193f4c781b81fe2df3125..0b1b531494c4f24c059d4b80cf7d6faaf8612d0d 100644 (file)
--- 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;