Print an error if filename is not found in html_include.

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 957b3268be1a49a5a1d336d3412a4e71d4ca5959..bddb04d1adcb8052b7590a07838b8b4c1f6a8247 100644 (file)
--- a/html.c
+++ b/html.c
@@ -6,7 +6,14 @@
  *   (see COPYING for full license text)
  */
 
  *   (see COPYING for full license text)
  */
 

-#include "cgit.h"
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+
+int htmlfd = STDOUT_FILENO;

 
 char *fmt(const char *format, ...)
 {
 
 char *fmt(const char *format, ...)
 {


@@ -21,8 +28,10 @@ char *fmt(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
        va_end(args);
        va_start(args, format);
        len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
        va_end(args);

-       if (len>sizeof(buf[bufidx]))
-               die("[html.c] string truncated: %s", format);
+       if (len>sizeof(buf[bufidx])) {
+               fprintf(stderr, "[html.c] string truncated: %s\n", format);
+               exit(1);
+       }

        return buf[bufidx];
 }
 
        return buf[bufidx];
 }
 


@@ -45,12 +54,10 @@ void htmlf(const char *format, ...)
 void html_txt(char *txt)
 {
        char *t = txt;
 void html_txt(char *txt)
 {
        char *t = txt;

-       while(*t){
+       while(t && *t){

                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
                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=='<')
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')


@@ -68,12 +75,10 @@ void html_txt(char *txt)
 void html_ntxt(int len, char *txt)
 {
        char *t = txt;
 void html_ntxt(int len, char *txt)
 {
        char *t = txt;

-       while(*t && len--){
+       while(t && *t && len--){

                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
                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=='<')
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')


@@ -84,12 +89,8 @@ void html_ntxt(int len, char *txt)
                }
                t++;
        }
                }
                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("...");
 }
        if (len<0)
                html("...");
 }


@@ -97,12 +98,10 @@ void html_ntxt(int len, char *txt)
 void html_attr(char *txt)
 {
        char *t = txt;
 void html_attr(char *txt)
 {
        char *t = txt;

-       while(*t){
+       while(t && *t){

                int c = *t;
                if (c=='<' || c=='>' || c=='\'') {
                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=='<')
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')


@@ -117,6 +116,27 @@ void html_attr(char *txt)
                html(txt);
 }
 
                html(txt);
 }
 

+void html_hidden(char *name, char *value)
+{
+       html("<input type='hidden' name='");
+       html_attr(name);
+       html("' value='");
+       html_attr(value);
+       html("'/>");
+}
+
+void html_option(char *value, char *text, char *selected_value)
+{
+       html("<option value='");
+       html_attr(value);
+       html("'");
+       if (selected_value && !strcmp(selected_value, value))
+               html(" selected='selected'");
+       html(">");
+       html_txt(text);
+       html("</option>\n");
+}
+

 void html_link_open(char *url, char *title, char *class)
 {
        html("<a href='");
 void html_link_open(char *url, char *title, char *class)
 {
        html("<a href='");


@@ -139,20 +159,87 @@ void html_link_close(void)
 
 void html_fileperm(unsigned short mode)
 {
 
 void html_fileperm(unsigned short mode)
 {

-       htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), 
+       htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),

              (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
 }
 
              (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
 }
 

-void html_filemode(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);
+       fclose(f);
+       return 0;
+}
+
+int hextoint(char c)

 {
 {

-       if (S_ISDIR(mode))
-               html("d");
-       else if (S_ISLNK(mode))
-               html("l");
+       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
        else

-               html("-");
-       html_fileperm(mode >> 6);
-       html_fileperm(mode >> 3);
-       html_fileperm(mode);
+               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;
+}