Fix segfault

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 8a6965970ae903dd434e490cfabbad27f39f900b..d531c209f2502ab43ceb36c749c69b7f4a93c3b1 100644 (file)
--- a/html.c
+++ b/html.c
@@ -45,12 +45,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=='<')


@@ -65,16 +63,36 @@ void html_txt(char *txt)
                html(txt);
 }
 
                html(txt);
 }
 

+void html_ntxt(int len, char *txt)
+{
+       char *t = txt;
+       while(t && *t && len--){
+               int c = *t;
+               if (c=='<' || c=='>' || c=='&') {
+                       write(htmlfd, 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);
+       if (len<0)
+               html("...");
+}

 
 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=='<')


@@ -89,6 +107,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");
+       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='");


@@ -121,6 +160,8 @@ void html_filemode(unsigned short mode)
                html("d");
        else if (S_ISLNK(mode))
                html("l");
                html("d");
        else if (S_ISLNK(mode))
                html("l");

+       else if (S_ISGITLINK(mode))
+               html("m");

        else
                html("-");
        html_fileperm(mode >> 6);
        else
                html("-");
        html_fileperm(mode >> 6);


@@ -128,3 +169,16 @@ void html_filemode(unsigned short mode)
        html_fileperm(mode);
 }
 
        html_fileperm(mode);
 }
 

+int html_include(const char *filename)
+{
+       FILE *f;
+       char buf[4096];
+       size_t len;
+
+       if (!(f = fopen(filename, "r")))
+               return -1;
+       while((len = fread(buf, 1, 4096, f)) > 0)
+               write(htmlfd, buf, len);
+       fclose(f);
+       return 0;
+}