32 files changed, 942 insertions, 267 deletions

diff --git a/.gitignore b/.gitignore
index 1e016e5..487728b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,10 @@
 cgit
 cgit.conf
 VERSION
+cgitrc.5
+cgitrc.5.fo
+cgitrc.5.html
+cgitrc.5.pdf
+cgitrc.5.xml
 *.o
 *.d
diff --git a/Makefile b/Makefile
index 44138ea..da2518b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.1.1
+GIT_VER = 1.6.4.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
@@ -100,7 +100,8 @@ ifdef NEEDS_LIBICONV
 endif
 
 
-.PHONY: all libgit test install uninstall clean force-version get-git
+.PHONY: all libgit test install uninstall clean force-version get-git \
+        doc man-doc html-doc clean-doc
 
 all: cgit
 
@@ -149,8 +150,22 @@ uninstall:
         rm -f $(CGIT_DATA_PATH)/cgit.css
         rm -f $(CGIT_DATA_PATH)/cgit.png
 
-clean:
+doc: man-doc html-doc pdf-doc
+
+man-doc: cgitrc.5.txt
+        a2x -f manpage cgitrc.5.txt
+
+html-doc: cgitrc.5.txt
+        a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+
+pdf-doc: cgitrc.5.txt
+        a2x -f pdf cgitrc.5.txt
+
+clean: clean-doc
         rm -f cgit VERSION *.o *.d
 
+clean-doc:
+        rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo
+
 get-git:
         curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git
diff --git a/cache.h b/cache.h
index 66cc41f..ac9276b 100644
--- a/cache.h
+++ b/cache.h
@@ -32,4 +32,6 @@ extern int cache_ls(const char *path);
 /* Print a message to stdout */
 extern void cache_log(const char *format, ...);
 
+extern unsigned long hash_str(const char *str);
+
 #endif /* CGIT_CACHE_H */
diff --git a/cgit-doc.css b/cgit-doc.css
new file mode 100644
index 0000000..5a399b6
--- /dev/null
+++ b/cgit-doc.css
@@ -0,0 +1,3 @@
+div.variablelist dt {
+        margin-top: 1em;
+}
diff --git a/cgit.c b/cgit.c
index 5301840..bd37788 100644
--- a/cgit.c
+++ b/cgit.c
@@ -17,9 +17,81 @@
 
 const char *cgit_version = CGIT_VERSION;
 
+void add_mimetype(const char *name, const char *value)
+{
+        struct string_list_item *item;
+
+        item = string_list_insert(xstrdup(name), &ctx.cfg.mimetypes);
+        item->util = xstrdup(value);
+}
+
+struct cgit_filter *new_filter(const char *cmd, int extra_args)
+{
+        struct cgit_filter *f;
+
+        if (!cmd || !cmd[0])
+                return NULL;
+
+        f = xmalloc(sizeof(struct cgit_filter));
+        f->cmd = xstrdup(cmd);
+        f->argv = xmalloc((2 + extra_args) * sizeof(char *));
+        f->argv[0] = f->cmd;
+        f->argv[1] = NULL;
+        return f;
+}
+
+static void process_cached_repolist(const char *path);
+
+void repo_config(struct cgit_repo *repo, const char *name, const char *value)
+{
+        if (!strcmp(name, "name"))
+                repo->name = xstrdup(value);
+        else if (!strcmp(name, "clone-url"))
+                repo->clone_url = xstrdup(value);
+        else if (!strcmp(name, "desc"))
+                repo->desc = xstrdup(value);
+        else if (!strcmp(name, "owner"))
+                repo->owner = xstrdup(value);
+        else if (!strcmp(name, "defbranch"))
+                repo->defbranch = xstrdup(value);
+        else if (!strcmp(name, "snapshots"))
+                repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
+        else if (!strcmp(name, "enable-log-filecount"))
+                repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+        else if (!strcmp(name, "enable-log-linecount"))
+                repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+        else if (!strcmp(name, "max-stats"))
+                repo->max_stats = cgit_find_stats_period(value, NULL);
+        else if (!strcmp(name, "module-link"))
+                repo->module_link= xstrdup(value);
+        else if (!strcmp(name, "section"))
+                repo->section = xstrdup(value);
+        else if (!strcmp(name, "readme") && value != NULL) {
+                if (*value == '/')
+                        ctx.repo->readme = xstrdup(value);
+                else
+                        ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
+        } else if (ctx.cfg.enable_filter_overrides) {
+                if (!strcmp(name, "about-filter"))
+                        repo->about_filter = new_filter(value, 0);
+                else if (!strcmp(name, "commit-filter"))
+                        repo->commit_filter = new_filter(value, 0);
+                else if (!strcmp(name, "source-filter"))
+                        repo->source_filter = new_filter(value, 1);
+        }
+}
+
 void config_cb(const char *name, const char *value)
 {
-        if (!strcmp(name, "root-title"))
+        if (!strcmp(name, "section") || !strcmp(name, "repo.group"))
+                ctx.cfg.section = xstrdup(value);
+        else if (!strcmp(name, "repo.url"))
+                ctx.repo = cgit_add_repo(value);
+        else if (ctx.repo && !strcmp(name, "repo.path"))
+                ctx.repo->path = trim_end(value, '/');
+        else if (ctx.repo && !prefixcmp(name, "repo."))
+                repo_config(ctx.repo, name + 5, value);
+        else if (!strcmp(name, "root-title"))
                 ctx.cfg.root_title = xstrdup(value);
         else if (!strcmp(name, "root-desc"))
                 ctx.cfg.root_desc = xstrdup(value);
@@ -31,6 +103,8 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.favicon = xstrdup(value);
         else if (!strcmp(name, "footer"))
                 ctx.cfg.footer = xstrdup(value);
+        else if (!strcmp(name, "head-include"))
+                ctx.cfg.head_include = xstrdup(value);
         else if (!strcmp(name, "header"))
                 ctx.cfg.header = xstrdup(value);
         else if (!strcmp(name, "logo"))
@@ -49,14 +123,22 @@ void config_cb(const char *name, const char *value)
                         ctx.cfg.virtual_root = "";
         } else if (!strcmp(name, "nocache"))
                 ctx.cfg.nocache = atoi(value);
+        else if (!strcmp(name, "noplainemail"))
+                ctx.cfg.noplainemail = atoi(value);
+        else if (!strcmp(name, "noheader"))
+                ctx.cfg.noheader = atoi(value);
         else if (!strcmp(name, "snapshots"))
                 ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
+        else if (!strcmp(name, "enable-filter-overrides"))
+                ctx.cfg.enable_filter_overrides = atoi(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
         else if (!strcmp(name, "enable-log-filecount"))
                 ctx.cfg.enable_log_filecount = atoi(value);
         else if (!strcmp(name, "enable-log-linecount"))
                 ctx.cfg.enable_log_linecount = atoi(value);
+        else if (!strcmp(name, "enable-tree-linenumbers"))
+                ctx.cfg.enable_tree_linenumbers = atoi(value);
         else if (!strcmp(name, "max-stats"))
                 ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
         else if (!strcmp(name, "cache-size"))
@@ -67,10 +149,18 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
                 ctx.cfg.cache_repo_ttl = atoi(value);
+        else if (!strcmp(name, "cache-scanrc-ttl"))
+                ctx.cfg.cache_scanrc_ttl = atoi(value);
         else if (!strcmp(name, "cache-static-ttl"))
                 ctx.cfg.cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 ctx.cfg.cache_dynamic_ttl = atoi(value);
+        else if (!strcmp(name, "about-filter"))
+                ctx.cfg.about_filter = new_filter(value, 0);
+        else if (!strcmp(name, "commit-filter"))
+                ctx.cfg.commit_filter = new_filter(value, 0);
+        else if (!strcmp(name, "embedded"))
+                ctx.cfg.embedded = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 ctx.cfg.max_msg_len = atoi(value);
         else if (!strcmp(name, "max-repodesc-length"))
@@ -79,6 +169,13 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.max_repo_count = atoi(value);
         else if (!strcmp(name, "max-commit-count"))
                 ctx.cfg.max_commit_count = atoi(value);
+        else if (!strcmp(name, "scan-path"))
+                if (!ctx.cfg.nocache && ctx.cfg.cache_size)
+                        process_cached_repolist(value);
+                else
+                        scan_tree(value, repo_config);
+        else if (!strcmp(name, "source-filter"))
+                ctx.cfg.source_filter = new_filter(value, 1);
         else if (!strcmp(name, "summary-log"))
                 ctx.cfg.summary_log = atoi(value);
         else if (!strcmp(name, "summary-branches"))
@@ -95,38 +192,9 @@ void config_cb(const char *name, const char *value)
                 ctx.cfg.clone_prefix = xstrdup(value);
         else if (!strcmp(name, "local-time"))
                 ctx.cfg.local_time = atoi(value);
-        else if (!strcmp(name, "repo.group"))
-                ctx.cfg.repo_group = xstrdup(value);
-        else if (!strcmp(name, "repo.url"))
-                ctx.repo = cgit_add_repo(value);
-        else if (!strcmp(name, "repo.name"))
-                ctx.repo->name = xstrdup(value);
-        else if (ctx.repo && !strcmp(name, "repo.path"))
-                ctx.repo->path = trim_end(value, '/');
-        else if (ctx.repo && !strcmp(name, "repo.clone-url"))
-                ctx.repo->clone_url = xstrdup(value);
-        else if (ctx.repo && !strcmp(name, "repo.desc"))
-                ctx.repo->desc = xstrdup(value);
-        else if (ctx.repo && !strcmp(name, "repo.owner"))
-                ctx.repo->owner = xstrdup(value);
-        else if (ctx.repo && !strcmp(name, "repo.defbranch"))
-                ctx.repo->defbranch = xstrdup(value);
-        else if (ctx.repo && !strcmp(name, "repo.snapshots"))
-                ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
-        else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount"))
-                ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
-        else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
-                ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
-        else if (ctx.repo && !strcmp(name, "repo.max-stats"))
-                ctx.repo->max_stats = cgit_find_stats_period(value, NULL);
-        else if (ctx.repo && !strcmp(name, "repo.module-link"))
-                ctx.repo->module_link= xstrdup(value);
-        else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
-                if (*value == '/')
-                        ctx.repo->readme = xstrdup(value);
-                else
-                        ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
-        } else if (!strcmp(name, "include"))
+        else if (!prefixcmp(name, "mimetype."))
+                add_mimetype(name + 9, value);
+        else if (!strcmp(name, "include"))
                 parse_configfile(value, config_cb);
 }
 
@@ -173,6 +241,11 @@ static void querystring_cb(const char *name, const char *value)
         }
 }
 
+char *xstrdupn(const char *str)
+{
+        return (str ? xstrdup(str) : NULL);
+}
+
 static void prepare_context(struct cgit_context *ctx)
 {
         memset(ctx, 0, sizeof(ctx));
@@ -184,10 +257,12 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.cache_repo_ttl = 5;
         ctx->cfg.cache_root = CGIT_CACHE_ROOT;
         ctx->cfg.cache_root_ttl = 5;
+        ctx->cfg.cache_scanrc_ttl = 15;
         ctx->cfg.cache_static_ttl = -1;
         ctx->cfg.css = "/cgit.css";
-        ctx->cfg.logo = "/git-logo.png";
+        ctx->cfg.logo = "/cgit.png";
         ctx->cfg.local_time = 0;
+        ctx->cfg.enable_tree_linenumbers = 1;
         ctx->cfg.max_repo_count = 50;
         ctx->cfg.max_commit_count = 50;
         ctx->cfg.max_lock_attempts = 5;
@@ -200,15 +275,34 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.root_title = "Git repository browser";
         ctx->cfg.root_desc = "a fast webinterface for the git dscm";
         ctx->cfg.script_name = CGIT_SCRIPT_NAME;
+        ctx->cfg.section = "";
         ctx->cfg.summary_branches = 10;
         ctx->cfg.summary_log = 10;
         ctx->cfg.summary_tags = 10;
+        ctx->env.cgit_config = xstrdupn(getenv("CGIT_CONFIG"));
+        ctx->env.http_host = xstrdupn(getenv("HTTP_HOST"));
+        ctx->env.https = xstrdupn(getenv("HTTPS"));
+        ctx->env.no_http = xstrdupn(getenv("NO_HTTP"));
+        ctx->env.path_info = xstrdupn(getenv("PATH_INFO"));
+        ctx->env.query_string = xstrdupn(getenv("QUERY_STRING"));
+        ctx->env.request_method = xstrdupn(getenv("REQUEST_METHOD"));
+        ctx->env.script_name = xstrdupn(getenv("SCRIPT_NAME"));
+        ctx->env.server_name = xstrdupn(getenv("SERVER_NAME"));
+        ctx->env.server_port = xstrdupn(getenv("SERVER_PORT"));
         ctx->page.mimetype = "text/html";
         ctx->page.charset = PAGE_ENCODING;
         ctx->page.filename = NULL;
         ctx->page.size = 0;
         ctx->page.modified = time(NULL);
         ctx->page.expires = ctx->page.modified;
+        ctx->page.etag = NULL;
+        memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
+        if (ctx->env.script_name)
+                ctx->cfg.script_name = ctx->env.script_name;
+        if (ctx->env.query_string)
+                ctx->qry.raw = ctx->env.query_string;
+        if (!ctx->env.cgit_config)
+                ctx->env.cgit_config = CGIT_CONFIG;
 }
 
 struct refmatch {
@@ -288,6 +382,8 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
         if (get_sha1(ctx->qry.head, sha1)) {
                 tmp = xstrdup(ctx->qry.head);
                 ctx->qry.head = ctx->repo->defbranch;
+                ctx->page.status = 404;
+                ctx->page.statusmsg = "not found";
                 cgit_print_http_headers(ctx);
                 cgit_print_docstart(ctx);
                 cgit_print_pageheader(ctx);
@@ -344,28 +440,151 @@ int cmp_repos(const void *a, const void *b)
         return strcmp(ra->url, rb->url);
 }
 
-void print_repo(struct cgit_repo *repo)
+char *build_snapshot_setting(int bitmap)
 {
-        printf("repo.url=%s\n", repo->url);
-        printf("repo.name=%s\n", repo->name);
-        printf("repo.path=%s\n", repo->path);
+        const struct cgit_snapshot_format *f;
+        char *result = xstrdup("");
+        char *tmp;
+        int len;
+
+        for (f = cgit_snapshot_formats; f->suffix; f++) {
+                if (f->bit & bitmap) {
+                        tmp = result;
+                        result = xstrdup(fmt("%s%s ", tmp, f->suffix));
+                        free(tmp);
+                }
+        }
+        len = strlen(result);
+        if (len)
+                result[len - 1] = '\0';
+        return result;
+}
+
+char *get_first_line(char *txt)
+{
+        char *t = xstrdup(txt);
+        char *p = strchr(t, '\n');
+        if (p)
+                *p = '\0';
+        return t;
+}
+
+void print_repo(FILE *f, struct cgit_repo *repo)
+{
+        fprintf(f, "repo.url=%s\n", repo->url);
+        fprintf(f, "repo.name=%s\n", repo->name);
+        fprintf(f, "repo.path=%s\n", repo->path);
         if (repo->owner)
-                printf("repo.owner=%s\n", repo->owner);
-        if (repo->desc)
-                printf("repo.desc=%s\n", repo->desc);
+                fprintf(f, "repo.owner=%s\n", repo->owner);
+        if (repo->desc) {
+                char *tmp = get_first_line(repo->desc);
+                fprintf(f, "repo.desc=%s\n", tmp);
+                free(tmp);
+        }
         if (repo->readme)
-                printf("repo.readme=%s\n", repo->readme);
-        printf("\n");
+                fprintf(f, "repo.readme=%s\n", repo->readme);
+        if (repo->defbranch)
+                fprintf(f, "repo.defbranch=%s\n", repo->defbranch);
+        if (repo->module_link)
+                fprintf(f, "repo.module-link=%s\n", repo->module_link);
+        if (repo->section)
+                fprintf(f, "repo.section=%s\n", repo->section);
+        if (repo->clone_url)
+                fprintf(f, "repo.clone-url=%s\n", repo->clone_url);
+        fprintf(f, "repo.enable-log-filecount=%d\n",
+                repo->enable_log_filecount);
+        fprintf(f, "repo.enable-log-linecount=%d\n",
+                repo->enable_log_linecount);
+        if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
+                fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
+        if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
+                fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
+        if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
+                fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd);
+        if (repo->snapshots != ctx.cfg.snapshots) {
+                char *tmp = build_snapshot_setting(repo->snapshots);
+                fprintf(f, "repo.snapshots=%s\n", tmp);
+                free(tmp);
+        }
+        if (repo->max_stats != ctx.cfg.max_stats)
+                fprintf(f, "repo.max-stats=%s\n",
+                        cgit_find_stats_periodname(repo->max_stats));
+        fprintf(f, "\n");
 }
 
-void print_repolist(struct cgit_repolist *list)
+void print_repolist(FILE *f, struct cgit_repolist *list, int start)
 {
         int i;
 
-        for(i = 0; i < list->count; i++)
-                print_repo(&list->repos[i]);
+        for(i = start; i < list->count; i++)
+                print_repo(f, &list->repos[i]);
+}
+
+/* Scan 'path' for git repositories, save the resulting repolist in 'cached_rc'
+ * and return 0 on success.
+ */
+static int generate_cached_repolist(const char *path, const char *cached_rc)