3 files changed, 155 insertions, 157 deletions

diff --git a/cgit.c b/cgit.c
index dbb023e..b3dd119 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,60 +1,210 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "cmd.h"
 #include "ui-shared.h"
 
+void config_cb(const char *name, const char *value)
+{
+        if (!strcmp(name, "root-title"))
+                ctx.cfg.root_title = xstrdup(value);
+        else if (!strcmp(name, "css"))
+                ctx.cfg.css = xstrdup(value);
+        else if (!strcmp(name, "logo"))
+                ctx.cfg.logo = xstrdup(value);
+        else if (!strcmp(name, "index-header"))
+                ctx.cfg.index_header = xstrdup(value);
+        else if (!strcmp(name, "index-info"))
+                ctx.cfg.index_info = xstrdup(value);
+        else if (!strcmp(name, "logo-link"))
+                ctx.cfg.logo_link = xstrdup(value);
+        else if (!strcmp(name, "module-link"))
+                ctx.cfg.module_link = xstrdup(value);
+        else if (!strcmp(name, "virtual-root")) {
+                ctx.cfg.virtual_root = trim_end(value, '/');
+                if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
+                        ctx.cfg.virtual_root = "";
+        } else if (!strcmp(name, "nocache"))
+                ctx.cfg.nocache = atoi(value);
+        else if (!strcmp(name, "snapshots"))
+                ctx.cfg.snapshots = cgit_parse_snapshots_mask(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, "cache-root"))
+                ctx.cfg.cache_root = xstrdup(value);
+        else if (!strcmp(name, "cache-root-ttl"))
+                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-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, "max-message-length"))
+                ctx.cfg.max_msg_len = atoi(value);
+        else if (!strcmp(name, "max-repodesc-length"))
+                ctx.cfg.max_repodesc_len = atoi(value);
+        else if (!strcmp(name, "max-commit-count"))
+                ctx.cfg.max_commit_count = atoi(value);
+        else if (!strcmp(name, "summary-log"))
+                ctx.cfg.summary_log = atoi(value);
+        else if (!strcmp(name, "summary-branches"))
+                ctx.cfg.summary_branches = atoi(value);
+        else if (!strcmp(name, "summary-tags"))
+                ctx.cfg.summary_tags = atoi(value);
+        else if (!strcmp(name, "agefile"))
+                ctx.cfg.agefile = xstrdup(value);
+        else if (!strcmp(name, "renamelimit"))
+                ctx.cfg.renamelimit = atoi(value);
+        else if (!strcmp(name, "robots"))
+                ctx.cfg.robots = xstrdup(value);
+        else if (!strcmp(name, "clone-prefix"))
+                ctx.cfg.clone_prefix = xstrdup(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.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"))
+                cgit_read_config(value, config_cb);
+}
+
+static void querystring_cb(const char *name, const char *value)
+{
+        if (!strcmp(name,"r")) {
+                ctx.qry.repo = xstrdup(value);
+                ctx.repo = cgit_get_repoinfo(value);
+        } else if (!strcmp(name, "p")) {
+                ctx.qry.page = xstrdup(value);
+        } else if (!strcmp(name, "url")) {
+                cgit_parse_url(value);
+        } else if (!strcmp(name, "qt")) {
+                ctx.qry.grep = xstrdup(value);
+        } else if (!strcmp(name, "q")) {
+                ctx.qry.search = xstrdup(value);
+        } else if (!strcmp(name, "h")) {
+                ctx.qry.head = xstrdup(value);
+                ctx.qry.has_symref = 1;
+        } else if (!strcmp(name, "id")) {
+                ctx.qry.sha1 = xstrdup(value);
+                ctx.qry.has_sha1 = 1;
+        } else if (!strcmp(name, "id2")) {
+                ctx.qry.sha2 = xstrdup(value);
+                ctx.qry.has_sha1 = 1;
+        } else if (!strcmp(name, "ofs")) {
+                ctx.qry.ofs = atoi(value);
+        } else if (!strcmp(name, "path")) {
+                ctx.qry.path = trim_end(value, '/');
+        } else if (!strcmp(name, "name")) {
+                ctx.qry.name = xstrdup(value);
+        }
+}
+
+static void prepare_context(struct cgit_context *ctx)
+{
+        memset(ctx, 0, sizeof(ctx));
+        ctx->cfg.agefile = "info/web/last-modified";
+        ctx->cfg.cache_dynamic_ttl = 5;
+        ctx->cfg.cache_max_create_time = 5;
+        ctx->cfg.cache_repo_ttl = 5;
+        ctx->cfg.cache_root = CGIT_CACHE_ROOT;
+        ctx->cfg.cache_root_ttl = 5;
+        ctx->cfg.cache_static_ttl = -1;
+        ctx->cfg.css = "/cgit.css";
+        ctx->cfg.logo = "/git-logo.png";
+        ctx->cfg.max_commit_count = 50;
+        ctx->cfg.max_lock_attempts = 5;
+        ctx->cfg.max_msg_len = 60;
+        ctx->cfg.max_repodesc_len = 60;
+        ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
+        ctx->cfg.renamelimit = -1;
+        ctx->cfg.robots = "index, nofollow";
+        ctx->cfg.root_title = "Git repository browser";
+        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
+        ctx->page.mimetype = "text/html";
+        ctx->page.charset = PAGE_ENCODING;
+        ctx->page.filename = NULL;
+}
+
 static int cgit_prepare_cache(struct cacheitem *item)
 {
         if (!ctx.repo && ctx.qry.repo) {
                 ctx.page.title = fmt("%s - %s", ctx.cfg.root_title,
                                       "Bad request");
                 cgit_print_http_headers(&ctx);
                 cgit_print_docstart(&ctx);
                 cgit_print_pageheader(&ctx);
                 cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo));
                 cgit_print_docend();
                 return 0;
         }
 
         if (!ctx.repo) {
                 item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root));
                 item->ttl = ctx.cfg.cache_root_ttl;
                 return 1;
         }
 
         if (!cgit_cmd) {
                 item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root,
                                          cache_safe_filename(ctx.repo->url),
                                          cache_safe_filename(ctx.qry.raw)));
                 item->ttl = ctx.cfg.cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root,
                                          cache_safe_filename(ctx.repo->url),
                                          ctx.qry.page,
                                          cache_safe_filename(ctx.qry.raw)));
                 if (ctx.qry.has_symref)
                         item->ttl = ctx.cfg.cache_dynamic_ttl;
                 else if (ctx.qry.has_sha1)
                         item->ttl = ctx.cfg.cache_static_ttl;
                 else
                         item->ttl = ctx.cfg.cache_repo_ttl;
         }
         return 1;
 }
 
 struct refmatch {
         char *req_ref;
         char *first_ref;
         int match;
 };
 
 int find_current_ref(const char *refname, const unsigned char *sha1,
                      int flags, void *cb_data)
 {
@@ -232,72 +382,72 @@ static void cgit_print_cache(struct cacheitem *item)
         if (fd<0)
                 die("Unable to open cached file %s", item->name);
 
         while((i=read(fd, buf, sizeof(buf))) > 0)
                 write(STDOUT_FILENO, buf, i);
 
         close(fd);
 }
 
 static void cgit_parse_args(int argc, const char **argv)
 {
         int i;
 
         for (i = 1; i < argc; i++) {
                 if (!strncmp(argv[i], "--cache=", 8)) {
                         ctx.cfg.cache_root = xstrdup(argv[i]+8);
                 }
                 if (!strcmp(argv[i], "--nocache")) {
                         ctx.cfg.nocache = 1;
                 }
                 if (!strncmp(argv[i], "--query=", 8)) {
                         ctx.qry.raw = xstrdup(argv[i]+8);
                 }
                 if (!strncmp(argv[i], "--repo=", 7)) {
                         ctx.qry.repo = xstrdup(argv[i]+7);
                 }
                 if (!strncmp(argv[i], "--page=", 7)) {
                         ctx.qry.page = xstrdup(argv[i]+7);
                 }
                 if (!strncmp(argv[i], "--head=", 7)) {
                         ctx.qry.head = xstrdup(argv[i]+7);
                         ctx.qry.has_symref = 1;
                 }
                 if (!strncmp(argv[i], "--sha1=", 7)) {
                         ctx.qry.sha1 = xstrdup(argv[i]+7);
                         ctx.qry.has_sha1 = 1;
                 }
                 if (!strncmp(argv[i], "--ofs=", 6)) {
                         ctx.qry.ofs = atoi(argv[i]+6);
                 }
         }
 }
 
 int main(int argc, const char **argv)
 {
         struct cacheitem item;
         const char *cgit_config_env = getenv("CGIT_CONFIG");
 
-        cgit_prepare_context(&ctx);
+        prepare_context(&ctx);
         item.st.st_mtime = time(NULL);
         cgit_repolist.length = 0;
         cgit_repolist.count = 0;
         cgit_repolist.repos = NULL;
 
         cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
-                         cgit_global_config_cb);
+                         config_cb);
         if (getenv("SCRIPT_NAME"))
                 ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
         if (getenv("QUERY_STRING"))
                 ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
         cgit_parse_args(argc, argv);
-        cgit_parse_query(ctx.qry.raw, cgit_querystring_cb);
+        cgit_parse_query(ctx.qry.raw, querystring_cb);
         if (!cgit_prepare_cache(&item))
                 return 0;
         if (ctx.cfg.nocache) {
                 cgit_fill_cache(&item, 0);
         } else {
                 cgit_check_cache(&item);
                 cgit_print_cache(&item);
         }
         return 0;
 }
diff --git a/cgit.h b/cgit.h
index c1a231d..b58676b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -146,99 +146,97 @@ struct cgit_config {
         int cache_repo_ttl;
         int cache_root_ttl;
         int cache_static_ttl;
         int enable_index_links;
         int enable_log_filecount;
         int enable_log_linecount;
         int max_commit_count;
         int max_lock_attempts;
         int max_msg_len;
         int max_repodesc_len;
         int nocache;
         int renamelimit;
         int snapshots;
         int summary_branches;
         int summary_log;
         int summary_tags;
 };
 
 struct cgit_page {
         time_t modified;
         time_t expires;
         char *mimetype;
         char *charset;
         char *filename;
         char *title;
 };
 
 struct cgit_context {
         struct cgit_query qry;
         struct cgit_config cfg;
         struct cgit_repo *repo;
         struct cgit_page page;
 };
 
 struct cgit_snapshot_format {
         const char *suffix;
         const char *mimetype;
         write_archive_fn_t write_func;
         int bit;
 };
 
 extern const char *cgit_version;
 
 extern struct cgit_repolist cgit_repolist;
 extern struct cgit_context ctx;
 extern const struct cgit_snapshot_format cgit_snapshot_formats[];
 extern int cgit_cmd;
 
-extern void cgit_prepare_context(struct cgit_context *ctx);
+extern struct cgit_repo *cgit_add_repo(const char *url);
 extern struct cgit_repo *cgit_get_repoinfo(const char *url);
-extern void cgit_global_config_cb(const char *name, const char *value);
 extern void cgit_repo_config_cb(const char *name, const char *value);
-extern void cgit_querystring_cb(const char *name, const char *value);
 
 extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 
 extern int hextoint(char c);
 extern char *trim_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
 
 extern void cgit_add_ref(struct reflist *list, struct refinfo *ref);
 extern int cgit_refs_cb(const char *refname, const unsigned char *sha1,
                         int flags, void *cb_data);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);
 
 extern int cgit_diff_files(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            linediff_fn fn);
 
 extern void cgit_diff_tree(const unsigned char *old_sha1,
                            const unsigned char *new_sha1,
                            filepair_fn fn, const char *prefix);
 
 extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 extern char *fmt(const char *format,...);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
 extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern const char *cgit_repobasename(const char *reponame);
 
 extern int cgit_parse_snapshots_mask(const char *str);
 
 #endif /* CGIT_H */
diff --git a/shared.c b/shared.c
index 800c06a..cd60da5 100644
--- a/shared.c
+++ b/shared.c
@@ -1,278 +1,128 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 struct cgit_repolist cgit_repolist;
 struct cgit_context ctx;
 int cgit_cmd;
 
 const char *cgit_version = CGIT_VERSION;
 
-void cgit_prepare_context(struct cgit_context *ctx)
-{
-        memset(ctx, 0, sizeof(ctx));
-        ctx->cfg.agefile = "info/web/last-modified";
-        ctx->cfg.cache_dynamic_ttl = 5;
-        ctx->cfg.cache_max_create_time = 5;
-        ctx->cfg.cache_repo_ttl = 5;
-        ctx->cfg.cache_root = CGIT_CACHE_ROOT;
-        ctx->cfg.cache_root_ttl = 5;
-        ctx->cfg.cache_static_ttl = -1;
-        ctx->cfg.css = "/cgit.css";
-        ctx->cfg.logo = "/git-logo.png";
-        ctx->cfg.max_commit_count = 50;
-        ctx->cfg.max_lock_attempts = 5;
-        ctx->cfg.max_msg_len = 60;
-        ctx->cfg.max_repodesc_len = 60;
-        ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
-        ctx->cfg.renamelimit = -1;
-        ctx->cfg.robots = "index, nofollow";
-        ctx->cfg.root_title = "Git repository browser";
-        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
-        ctx->page.mimetype = "text/html";
-        ctx->page.charset = PAGE_ENCODING;
-        ctx->page.filename = NULL;
-}
-
 int chk_zero(int result, char *msg)
 {
         if (result != 0)
                 die("%s: %s", msg, strerror(errno));
         return result;
 }
 
 int chk_positive(int result, char *msg)
 {
         if (result <= 0)
                 die("%s: %s", msg, strerror(errno));
         return result;
 }
 
 int chk_non_negative(int result, char *msg)
 {
             if (result < 0)
                     die("%s: %s",msg, strerror(errno));
         return result;
 }
 
-struct cgit_repo *add_repo(const char *url)
+struct cgit_repo *cgit_add_repo(const char *url)
 {
         struct cgit_repo *ret;
 
         if (++cgit_repolist.count > cgit_repolist.length) {
                 if (cgit_repolist.length == 0)
                         cgit_repolist.length = 8;
                 else
                         cgit_repolist.length *= 2;
                 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
                                                cgit_repolist.length *
                                                sizeof(struct cgit_repo));
         }
 
         ret = &cgit_repolist.repos[cgit_repolist.count-1];
         ret->url = trim_end(url, '/');
         ret->name = ret->url;
         ret->path = NULL;
         ret->desc = "[no description]";
         ret->owner = NULL;
         ret->group = ctx.cfg.repo_group;
         ret->defbranch = "master";
         ret->snapshots = ctx.cfg.snapshots;
         ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
         ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
         ret->module_link = ctx.cfg.module_link;
         ret->readme = NULL;
         return ret;
 }
 
 struct cgit_repo *cgit_get_repoinfo(const char *url)
 {
         int i;
         struct cgit_repo *repo;
 
         for (i=0; i<cgit_repolist.count; i++) {
                 repo = &cgit_repolist.repos[i];
                 if (!strcmp(repo->url, url))
                         return repo;
         }
         return NULL;
 }
 
-void cgit_global_config_cb(const char *name, const char *value)
-{
-        if (!strcmp(name, "root-title"))
-                ctx.cfg.root_title = xstrdup(value);
-        else if (!strcmp(name, "css"))
-                ctx.cfg.css = xstrdup(value);
-        else if (!strcmp(name, "logo"))
-                ctx.cfg.logo = xstrdup(value);
-        else if (!strcmp(name, "index-header"))
-                ctx.cfg.index_header = xstrdup(value);
-        else if (!strcmp(name, "index-info"))
-                ctx.cfg.index_info = xstrdup(value);
-        else if (!strcmp(name, "logo-link"))
-                ctx.cfg.logo_link = xstrdup(value);
-        else if (!strcmp(name, "module-link"))
-                ctx.cfg.module_link = xstrdup(value);
-        else if (!strcmp(name, "virtual-root")) {
-                ctx.cfg.virtual_root = trim_end(value, '/');
-                if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
-                        ctx.cfg.virtual_root = "";
-        } else if (!strcmp(name, "nocache"))
-                ctx.cfg.nocache = atoi(value);
-        else if (!strcmp(name, "snapshots"))
-                ctx.cfg.snapshots = cgit_parse_snapshots_mask(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, "cache-root"))
-                ctx.cfg.cache_root = xstrdup(value);
-        else if (!strcmp(name, "cache-root-ttl"))
-                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-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, "max-message-length"))
-                ctx.cfg.max_msg_len = atoi(value);
-        else if (!strcmp(name, "max-repodesc-length"))
-                ctx.cfg.max_repodesc_len = atoi(value);
-        else if (!strcmp(name, "max-commit-count"))
-                ctx.cfg.max_commit_count = atoi(value);
-        else if (!strcmp(name, "summary-log"))
-                ctx.cfg.summary_log = atoi(value);
-        else if (!strcmp(name, "summary-branches"))
-                ctx.cfg.summary_branches = atoi(value);
-        else if (!strcmp(name, "summary-tags"))
-                ctx.cfg.summary_tags = atoi(value);
-        else if (!strcmp(name, "agefile"))
-                ctx.cfg.agefile = xstrdup(value);
-        else if (!strcmp(name, "renamelimit"))
-                ctx.cfg.renamelimit = atoi(value);
-        else if (!strcmp(name, "robots"))
-                ctx.cfg.robots = xstrdup(value);
-        else if (!strcmp(name, "clone-prefix"))
-                ctx.cfg.clone_prefix = xstrdup(value);
-        else if (!strcmp(name, "repo.group"))
-                ctx.cfg.repo_group = xstrdup(value);
-        else if (!strcmp(name, "repo.url"))
-                ctx.repo = 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.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"))
-                cgit_read_config(value, cgit_global_config_cb);
-}
-
-void cgit_querystring_cb(const char *name, const char *value)
-{
-        if (!strcmp(name,"r")) {
-                ctx.qry.repo = xstrdup(value);
-                ctx.repo = cgit_get_repoinfo(value);
-        } else if (!strcmp(name, "p")) {
-                ctx.qry.page = xstrdup(value);
-        } else if (!strcmp(name, "url")) {
-                cgit_parse_url(value);
-        } else if (!strcmp(name, "qt")) {
-                ctx.qry.grep = xstrdup(value);
-        } else if (!strcmp(name, "q")) {
-                ctx.qry.search = xstrdup(value);
-        } else if (!strcmp(name, "h")) {
-                ctx.qry.head = xstrdup(value);
-                ctx.qry.has_symref = 1;
-        } else if (!strcmp(name, "id")) {
-                ctx.qry.sha1 = xstrdup(value);
-                ctx.qry.has_sha1 = 1;
-        } else if (!strcmp(name, "id2")) {
-                ctx.qry.sha2 = xstrdup(value);
-                ctx.qry.has_sha1 = 1;
-        } else if (!strcmp(name, "ofs")) {
-                ctx.qry.ofs = atoi(value);
-        } else if (!strcmp(name, "path")) {
-                ctx.qry.path = trim_end(value, '/');
-        } else if (!strcmp(name, "name")) {
-                ctx.qry.name = xstrdup(value);
-        }
-}
-
 void *cgit_free_commitinfo(struct commitinfo *info)
 {
         free(info->author);
         free(info->author_email);
         free(info->committer);
         free(info->committer_email);
         free(info->subject);
         free(info->msg);
         free(info->msg_encoding);
         free(info);
         return NULL;
 }
 
 int hextoint(char c)
 {
         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
                 return -1;
 }
 
 char *trim_end(const char *str, char c)
 {
         int len;
         char *s, *t;
 
         if (str == NULL)
                 return NULL;
         t = (char *)str;
         len = strlen(t);
         while(len > 0 && t[len - 1] == c)
                 len--;
 
         if (len == 0)
                 return NULL;
 
         c = t[len];
         t[len] = '\0';
         s = xstrdup(t);
         t[len] = c;
         return s;
 }
 
 char *strlpart(char *txt, int maxlen)