| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | html.c | 14 | ||||
| -rw-r--r-- | shared.c | 3 | ||||
| -rw-r--r-- | ui-repolist.c | 5 |
6 files changed, 5 insertions, 27 deletions
@@ -31,12 +31,14 @@ CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' # -# If make is run on a nongit platform, get the git sources as a tarball. +# If make is run on a nongit platform, we need to get the git sources as a tarball. +# But there is currently no recent enough tarball available on kernel.org, so download +# a zipfile from hjemli.net instead # GITVER = $(shell git version 2>/dev/null || echo nogit) ifeq ($(GITVER),nogit) -GITURL = http://www.kernel.org/pub/software/scm/git/git-1.5.2.tar.bz2 -INITGIT = test -e git/git.c || ((curl "$(GITURL)" | tar -xj) && mv git-1.5.2 git) +GITURL = http://hjemli.net/git/git/snapshot/?id=v1.5.2-rc2 +INITGIT = test -e git/git.c || (curl "$(GITURL)" > tmp.zip && unzip tmp.zip) else INITGIT = ./submodules.sh -i endif @@ -87,7 +87,6 @@ extern int cgit_cmd; extern char *cgit_root_title; extern char *cgit_css; extern char *cgit_logo; -extern char *cgit_index_header; extern char *cgit_logo_link; extern char *cgit_module_link; extern char *cgit_virtual_root; @@ -159,7 +158,6 @@ extern void html_hidden(char *name, char *value); extern void html_link_open(char *url, char *title, char *class); extern void html_link_close(void); extern void html_filemode(unsigned short mode); -extern int html_include(const char *filename); extern int cgit_read_config(const char *filename, configfn fn); extern int cgit_parse_query(char *txt, configfn fn); diff --git a/git b/git -Subproject aba170cdb4874b72dd619e6f7bbc13c33295f83 +Subproject 9159afbfce955db86373dab95b5f8e31fb763da @@ -166,17 +166,3 @@ void html_filemode(unsigned short mode) html_fileperm(mode >> 3); 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; -} @@ -15,7 +15,6 @@ int cgit_cmd; char *cgit_root_title = "Git repository browser"; 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/"; char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; char *cgit_virtual_root = NULL; @@ -128,8 +127,6 @@ void cgit_global_config_cb(const char *name, const char *value) cgit_css = xstrdup(value); else if (!strcmp(name, "logo")) cgit_logo = xstrdup(value); - else if (!strcmp(name, "index-header")) - cgit_index_header = xstrdup(value); else if (!strcmp(name, "logo-link")) cgit_logo_link = xstrdup(value); else if (!strcmp(name, "module-link")) diff --git a/ui-repolist.c b/ui-repolist.c index 8e367a2..d7311e4 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -17,11 +17,6 @@ void cgit_print_repolist(struct cacheitem *item) cgit_print_pageheader(cgit_root_title, 0); 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'>" "<th class='left'>Name</th>" "<th class='left'>Description</th>" |