Fix doc-related glitches in Makefile and .gitignore

[cgit.git] / html.c

diff --git a/html.c b/html.c
index 0962e71a32b66a68f1653594de37506425e5eca9..66ba65dcf6245d6e7d78ccd3d8ac1f57376fb7d8 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;
 
@@ -34,6 +35,11 @@ char *fmt(const char *format, ...)
        return buf[bufidx];
 }
 
+void html_raw(const char *data, size_t size)
+{
+       write(htmlfd, data, size);
+}
+
 void html(const char *txt)
 {
        write(htmlfd, txt, strlen(txt));
@@ -50,15 +56,20 @@ void htmlf(const char *format, ...)
        html(buf);
 }
 
+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(char *txt)
 {
        char *t = 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 +90,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 +101,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("...");
 }
@@ -107,16 +112,48 @@ void html_attr(char *txt)
        char *t = txt;
        while(t && *t){
                int c = *t;
-               if (c=='<' || c=='>' || c=='\'') {
-                       *t = '\0';
-                       html(txt);
-                       *t = c;
+               if (c=='<' || c=='>' || c=='\'' || c=='\"') {
+                       write(htmlfd, txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
                                html("&lt;");
                        else if (c=='\'')
-                               html("&quote;");
+                               html("&#x27;");
+                       else if (c=='"')
+                               html("&quot;");
+                       txt = t+1;
+               }
+               t++;
+       }
+       if (t!=txt)
+               html(txt);
+}
+
+void html_url_path(char *txt)
+{
+       char *t = txt;
+       while(t && *t){
+               int c = *t;
+               if (c=='"' || c=='#' || c=='\'' || c=='?') {
+                       write(htmlfd, txt, t - txt);
+                       write(htmlfd, fmt("%%%2x", c), 3);
+                       txt = t+1;
+               }
+               t++;
+       }
+       if (t!=txt)
+               html(txt);
+}
+
+void html_url_arg(char *txt)
+{
+       char *t = txt;
+       while(t && *t){
+               int c = *t;
+               if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
+                       write(htmlfd, txt, t - txt);
+                       write(htmlfd, fmt("%%%2x", c), 3);
                        txt = t+1;
                }
                t++;
@@ -178,10 +215,77 @@ 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);
        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';
+       else
+               return -1;
+}
+
+char *convert_query_hexchar(char *txt)
+{
+       int d1, d2;
+       if (strlen(txt) < 3) {
+               *txt = '\0';
+               return txt-1;
+       }
+       d1 = hextoint(*(txt+1));
+       d2 = hextoint(*(txt+2));
+       if (d1<0 || d2<0) {
+               strcpy(txt, txt+3);
+               return txt-1;
+       } else {
+               *txt = d1 * 16 + d2;
+               strcpy(txt+1, txt+3);
+               return txt;
+       }
+}
+
+int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
+{
+       char *t, *value = NULL, c;
+
+       if (!txt)
+               return 0;
+
+       t = txt = strdup(txt);
+       if (t == NULL) {
+               printf("Out of memory\n");
+               exit(1);
+       }
+       while((c=*t) != '\0') {
+               if (c=='=') {
+                       *t = '\0';
+                       value = t+1;
+               } else if (c=='+') {
+                       *t = ' ';
+               } else if (c=='%') {
+                       t = convert_query_hexchar(t);
+               } else if (c=='&') {
+                       *t = '\0';
+                       (*fn)(txt, value);
+                       txt = t+1;
+                       value = NULL;
+               }
+               t++;
+       }
+       if (t!=txt)
+               (*fn)(txt, value);
+       return 0;
+}