html: check return value of write

[cgit.git] / html.c

diff --git a/html.c b/html.c
index 8f6e4f6e0358fa7e6a4cc1bc3ae5e5cdfe8ddbae..d60a41ffd45859e748588f488f2ac8f38f9119ad 100644 (file)
--- a/html.c
+++ b/html.c
@@ -39,7 +39,7 @@ static const char* url_escape_table[256] = {
        "%fe", "%ff"
 };
 
-int htmlfd = STDOUT_FILENO;
+static int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
 {
@@ -54,7 +54,7 @@ char *fmt(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
        va_end(args);
-       if (len>sizeof(buf[bufidx])) {
+       if (len > sizeof(buf[bufidx])) {
                fprintf(stderr, "[html.c] string truncated: %s\n", format);
                exit(1);
        }
@@ -63,12 +63,13 @@ char *fmt(const char *format, ...)
 
 void html_raw(const char *data, size_t size)
 {
-       write(htmlfd, data, size);
+       if (write(htmlfd, data, size) != size)
+               fprintf(stderr, "[html.c] html output truncated.\n");
 }
 
 void html(const char *txt)
 {
-       write(htmlfd, txt, strlen(txt));
+       html_raw(txt, strlen(txt));
 }
 
 void htmlf(const char *format, ...)
@@ -92,93 +93,93 @@ void html_status(int code, const char *msg, int more_headers)
 void html_txt(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                int c = *t;
-               if (c=='<' || c=='>' || c=='&') {
+               if (c == '<' || c == '>' || c == '&') {
                        html_raw(txt, t - txt);
-                       if (c=='>')
+                       if (c == '>')
                                html("&gt;");
-                       else if (c=='<')
+                       else if (c == '<')
                                html("&lt;");
-                       else if (c=='&')
+                       else if (c == '&')
                                html("&amp;");
-                       txt = t+1;
+                       txt = t + 1;
                }
                t++;
        }
-       if (t!=txt)
+       if (t != txt)
                html(txt);
 }
 
 void html_ntxt(int len, const char *txt)
 {
        const char *t = txt;
-       while(t && *t && len--){
+       while (t && *t && len--) {
                int c = *t;
-               if (c=='<' || c=='>' || c=='&') {
+               if (c == '<' || c == '>' || c == '&') {
                        html_raw(txt, t - txt);
-                       if (c=='>')
+                       if (c == '>')
                                html("&gt;");
-                       else if (c=='<')
+                       else if (c == '<')
                                html("&lt;");
-                       else if (c=='&')
+                       else if (c == '&')
                                html("&amp;");
-                       txt = t+1;
+                       txt = t + 1;
                }
                t++;
        }
-       if (t!=txt)
+       if (t != txt)
                html_raw(txt, t - txt);
-       if (len<0)
+       if (len < 0)
                html("...");
 }
 
 void html_attr(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                int c = *t;
-               if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') {
+               if (c == '<' || c == '>' || c == '\'' || c == '\"' || c == '&') {
                        html_raw(txt, t - txt);
-                       if (c=='>')
+                       if (c == '>')
                                html("&gt;");
-                       else if (c=='<')
+                       else if (c == '<')
                                html("&lt;");
-                       else if (c=='\'')
+                       else if (c == '\'')
                                html("&#x27;");
-                       else if (c=='"')
+                       else if (c == '"')
                                html("&quot;");
-                       else if (c=='&')
+                       else if (c == '&')
                                html("&amp;");
-                       txt = t+1;
+                       txt = t + 1;
                }
                t++;
        }
-       if (t!=txt)
+       if (t != txt)
                html(txt);
 }
 
 void html_url_path(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                unsigned char c = *t;
                const char *e = url_escape_table[c];
-               if (e && c!='+' && c!='&') {
+               if (e && c != '+' && c != '&') {
                        html_raw(txt, t - txt);
                        html(e);
-                       txt = t+1;
+                       txt = t + 1;
                }
                t++;
        }
-       if (t!=txt)
+       if (t != txt)
                html(txt);
 }
 
 void html_url_arg(const char *txt)
 {
        const char *t = txt;
-       while(t && *t){
+       while (t && *t) {
                unsigned char c = *t;
                const char *e = url_escape_table[c];
                if (c == ' ')
@@ -186,11 +187,11 @@ void html_url_arg(const char *txt)
                if (e) {
                        html_raw(txt, t - txt);
                        html(e);
-                       txt = t+1;
+                       txt = t + 1;
                }
                t++;
        }
-       if (t!=txt)
+       if (t != txt)
                html(txt);
 }
 
@@ -260,13 +261,13 @@ int html_include(const char *filename)
                        filename, strerror(errno), errno);
                return -1;
        }
-       while((len = fread(buf, 1, 4096, f)) > 0)
+       while ((len = fread(buf, 1, 4096, f)) > 0)
                html_raw(buf, len);
        fclose(f);
        return 0;
 }
 
-int hextoint(char c)
+static int hextoint(char c)
 {
        if (c >= 'a' && c <= 'f')
                return 10 + c - 'a';
@@ -278,7 +279,7 @@ int hextoint(char c)
                return -1;
 }
 
-char *convert_query_hexchar(char *txt)
+static char *convert_query_hexchar(char *txt)
 {
        int d1, d2, n;
        n = strlen(txt);
@@ -286,14 +287,14 @@ char *convert_query_hexchar(char *txt)
                *txt = '\0';
                return txt-1;
        }
-       d1 = hextoint(*(txt+1));
-       d2 = hextoint(*(txt+2));
-       if (d1<0 || d2<0) {
-               memmove(txt, txt+3, n-2);
+       d1 = hextoint(*(txt + 1));
+       d2 = hextoint(*(txt + 2));
+       if (d1 < 0 || d2 < 0) {
+               memmove(txt, txt + 3, n - 2);
                return txt-1;
        } else {
                *txt = d1 * 16 + d2;
-               memmove(txt+1, txt+3, n-2);
+               memmove(txt + 1, txt + 3, n - 2);
                return txt;
        }
 }
@@ -310,23 +311,23 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
                printf("Out of memory\n");
                exit(1);
        }
-       while((c=*t) != '\0') {
-               if (c=='=') {
+       while ((c=*t) != '\0') {
+               if (c == '=') {
                        *t = '\0';
-                       value = t+1;
-               } else if (c=='+') {
+                       value = t + 1;
+               } else if (c == '+') {
                        *t = ' ';
-               } else if (c=='%') {
+               } else if (c == '%') {
                        t = convert_query_hexchar(t);
-               } else if (c=='&') {
+               } else if (c == '&') {
                        *t = '\0';
                        (*fn)(txt, value);
-                       txt = t+1;
+                       txt = t + 1;
                        value = NULL;
                }
                t++;
        }
-       if (t!=txt)
+       if (t != txt)
                (*fn)(txt, value);
        free(o);
        return 0;