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>

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
@@ -86,111 +86,111 @@ void html_status(int code, const char *msg, int more_headers)
 {
         htmlf("Status: %d %s\n", code, msg);
         if (!more_headers)
                 html("\n");
 }
 
 void html_txt(const char *txt)
 {
         const char *t = 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=='<')
                                 html("&lt;");
                         else if (c=='&')
                                 html("&amp;");
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 html(txt);
 }
 
 void html_ntxt(int len, const char *txt)
 {
         const char *t = 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=='<')
                                 html("&lt;");
                         else if (c=='&')
                                 html("&amp;");
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
-                write(htmlfd, txt, t - txt);
+                html_raw(txt, t - txt);
         if (len<0)
                 html("...");
 }
 
 void html_attr(const char *txt)
 {
         const char *t = 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=='<')
                                 html("&lt;");
                         else if (c=='\'')
                                 html("&#x27;");
                         else if (c=='"')
                                 html("&quot;");
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 html(txt);
 }
 
 void html_url_path(const char *txt)
 {
         const char *t = txt;
         while(t && *t){
                 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++;
         }
         if (t!=txt)
                 html(txt);
 }
 
 void html_url_arg(const char *txt)
 {
         const char *t = txt;
         while(t && *t){
                 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++;
         }
         if (t!=txt)
                 html(txt);
 }
 
 void html_hidden(const char *name, const char *value)
 {
         html("<input type='hidden' name='");
         html_attr(name);
@@ -240,25 +240,25 @@ void html_fileperm(unsigned short mode)
 int html_include(const char *filename)
 {
         FILE *f;
         char buf[4096];
         size_t len;
 
         if (!(f = fopen(filename, "r"))) {
                 fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n",
                         filename, strerror(errno), errno);
                 return -1;
         }
         while((len = fread(buf, 1, 4096, f)) > 0)
-                write(htmlfd, buf, len);
+                html_raw(buf, len);
         fclose(f);
         return 0;
 }
 
 int hextoint(char c)
 {
         if (c >= 'a' && c <= 'f')
                 return 10 + c - 'a';
         else if (c >= 'A' && c <= 'F')
                 return 10 + c - 'A';
         else if (c >= '0' && c <= '9')
                 return c - '0';
diff --git a/ui-blob.c b/ui-blob.c
index 667a451..ec435e1 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -43,25 +43,25 @@ int cgit_print_file(char *path, const char *head)
                 found_path = 0;
                 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
                 if (!found_path)
                         return -1;
                 type = sha1_object_info(sha1, &size);
         }
         if (type == OBJ_BAD)
                 return -1;
         buf = read_sha1_file(sha1, &type, &size);
         if (!buf)
                 return -1;
         buf[size] = '\0';
-        write(htmlfd, buf, size);
+        html_raw(buf, size);
         return 0;
 }
 
 void cgit_print_blob(const char *hex, char *path, const char *head)
 {
         unsigned char sha1[20];
         enum object_type type;
         char *buf;
         unsigned long size;
         struct commit *commit;
         const char *paths[] = {path, NULL};
 
@@ -99,14 +99,14 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
         }
 
         buf[size] = '\0';
         ctx.page.mimetype = ctx.qry.mimetype;
         if (!ctx.page.mimetype) {
                 if (buffer_is_binary(buf, size))
                         ctx.page.mimetype = "application/octet-stream";
                 else
                         ctx.page.mimetype = "text/plain";
         }
         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
@@ -37,25 +37,25 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                         }
                 }
                 html("</pre></td>\n");
         }
         else {
                 html("<tr>\n");
         }
 
         if (ctx.repo->source_filter) {
                 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;
         }
 
         html("<td class='lines'><pre><code>");
         html_txt(buf);
         html("</code></pre></td></tr></table>\n");
 }
 
 #define ROWLEN 32