Merge branch 'index-header'

* index-header:
  Teach cgit howto include an external file on index page.
  Add html_include()

4 files changed, 24 insertions, 0 deletions

diff --git a/cgit.h b/cgit.h
index f3d783e..3ee11bb 100644
--- a/cgit.h
+++ b/cgit.h
@@ -77,2 +77,3 @@ extern char *cgit_css;
 extern char *cgit_logo;
+extern char *cgit_index_header;
 extern char *cgit_logo_link;
@@ -146,2 +147,3 @@ extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
+extern int html_include(const char *filename);
 
diff --git a/html.c b/html.c
index 175b4b6..33a956f 100644
--- a/html.c
+++ b/html.c
@@ -168 +168,15 @@ 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")))
+                return -1;
+        while((len = fread(buf, 1, 4096, f)) > 0)
+                write(htmlfd, buf, len);
+        fclose(f);
+        return 0;
+}
diff --git a/shared.c b/shared.c
index 53cd9b0..54b1813 100644
--- a/shared.c
+++ b/shared.c
@@ -16,2 +16,3 @@ char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
+char *cgit_index_header = NULL;
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
@@ -103,2 +104,4 @@ void cgit_global_config_cb(const char *name, const char *value)
                 cgit_logo = xstrdup(value);
+        else if (!strcmp(name, "index-header"))
+                cgit_index_header = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
diff --git a/ui-repolist.c b/ui-repolist.c
index d7311e4..8e367a2 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -19,2 +19,7 @@ void cgit_print_repolist(struct cacheitem *item)
         html("<table class='list nowrap'>");
+        if (cgit_index_header) {
+                html("<tr class='nohover'><td colspan='4' class='include-block'>");
+                html_include(cgit_index_header);
+                html("</td></tr>");
+        }
         html("<tr class='nohover'>"