Print an error if filename is not found in html_include.

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 98ffaf976a4abdf92e4ba4f5a973ab0c5184a515..bddb04d1adcb8052b7590a07838b8b4c1f6a8247 100644 (file)
--- a/html.c
+++ b/html.c
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
+#include <errno.h>
 
 int htmlfd = STDOUT_FILENO;
 
@@ -56,9 +57,7 @@ void html_txt(char *txt)
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
-                       *t = '\0';
-                       html(txt);
-                       *t = c;
+                       write(htmlfd, txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
@@ -79,9 +78,7 @@ void html_ntxt(int len, char *txt)
        while(t && *t && len--){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
-                       *t = '\0';
-                       html(txt);
-                       *t = c;
+                       write(htmlfd, txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
@@ -92,12 +89,8 @@ void html_ntxt(int len, char *txt)
                }
                t++;
        }
-       if (t!=txt) {
-               char c = *t;
-               *t = '\0';
-               html(txt);
-               *t = c;
-       }
+       if (t!=txt)
+               write(htmlfd, txt, t - txt);
        if (len<0)
                html("...");
 }
@@ -108,9 +101,7 @@ void html_attr(char *txt)
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='\'') {
-                       *t = '\0';
-                       html(txt);
-                       *t = c;
+                       write(htmlfd, txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
@@ -178,8 +169,11 @@ int html_include(const char *filename)
        char buf[4096];
        size_t len;
 
-       if (!(f = fopen(filename, "r")))
+       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);
        fclose(f);