Cleanup handling of environment variables

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index b3dd1199c87baa72c5eec2de450f60bc8a90837e..a92383d520d79ec1e590504766436f448884fa98 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -7,15 +7,57 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "cache.h"

 #include "cmd.h"
 #include "cmd.h"

+#include "configfile.h"
+#include "html.h"

 #include "ui-shared.h"
 #include "ui-shared.h"

+#include "ui-stats.h"
+#include "scan-tree.h"
+
+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;
+}

 
 void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);
 
 void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root-title"))
                ctx.cfg.root_title = xstrdup(value);

+       else if (!strcmp(name, "root-desc"))
+               ctx.cfg.root_desc = xstrdup(value);
+       else if (!strcmp(name, "root-readme"))
+               ctx.cfg.root_readme = xstrdup(value);

        else if (!strcmp(name, "css"))
                ctx.cfg.css = xstrdup(value);
        else if (!strcmp(name, "css"))
                ctx.cfg.css = xstrdup(value);

+       else if (!strcmp(name, "favicon"))
+               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"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
        else if (!strcmp(name, "logo"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))


@@ -32,6 +74,10 @@ void config_cb(const char *name, const char *value)
                        ctx.cfg.virtual_root = "";
        } else if (!strcmp(name, "nocache"))
                ctx.cfg.nocache = atoi(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-index-links"))
        else if (!strcmp(name, "snapshots"))
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-index-links"))


@@ -40,6 +86,10 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);
                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, "max-stats"))
+               ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);
+       else if (!strcmp(name, "cache-size"))
+               ctx.cfg.cache_size = atoi(value);

        else if (!strcmp(name, "cache-root"))
                ctx.cfg.cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))
        else if (!strcmp(name, "cache-root"))
                ctx.cfg.cache_root = xstrdup(value);
        else if (!strcmp(name, "cache-root-ttl"))


@@ -50,12 +100,22 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.cache_static_ttl = atoi(value);
        else if (!strcmp(name, "cache-dynamic-ttl"))
                ctx.cfg.cache_dynamic_ttl = atoi(value);
                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"))
                ctx.cfg.max_repodesc_len = 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-repo-count"))
+               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, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);

+       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"))
        else if (!strcmp(name, "summary-log"))
                ctx.cfg.summary_log = atoi(value);
        else if (!strcmp(name, "summary-branches"))


@@ -70,6 +130,10 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.robots = xstrdup(value);
        else if (!strcmp(name, "clone-prefix"))
                ctx.cfg.clone_prefix = xstrdup(value);
                ctx.cfg.robots = xstrdup(value);
        else if (!strcmp(name, "clone-prefix"))
                ctx.cfg.clone_prefix = xstrdup(value);

+       else if (!strcmp(name, "local-time"))
+               ctx.cfg.local_time = atoi(value);
+       else if (!prefixcmp(name, "mimetype."))
+               add_mimetype(name + 9, value);

        else if (!strcmp(name, "repo.group"))
                ctx.cfg.repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))
        else if (!strcmp(name, "repo.group"))
                ctx.cfg.repo_group = xstrdup(value);
        else if (!strcmp(name, "repo.url"))


@@ -92,15 +156,23 @@ void config_cb(const char *name, const char *value)
                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);
                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.module-link"))
                ctx.repo->module_link= xstrdup(value);

+       else if (ctx.repo && !strcmp(name, "repo.about-filter"))
+               ctx.repo->about_filter = new_filter(value, 0);
+       else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
+               ctx.repo->commit_filter = new_filter(value, 0);
+       else if (ctx.repo && !strcmp(name, "repo.source-filter"))
+               ctx.repo->source_filter = new_filter(value, 1);

        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 (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);
+               parse_configfile(value, config_cb);

 }
 
 static void querystring_cb(const char *name, const char *value)
 }
 
 static void querystring_cb(const char *name, const char *value)


@@ -111,6 +183,7 @@ static void querystring_cb(const char *name, const char *value)
        } else if (!strcmp(name, "p")) {
                ctx.qry.page = xstrdup(value);
        } else if (!strcmp(name, "url")) {
        } else if (!strcmp(name, "p")) {
                ctx.qry.page = xstrdup(value);
        } else if (!strcmp(name, "url")) {

+               ctx.qry.url = xstrdup(value);

                cgit_parse_url(value);
        } else if (!strcmp(name, "qt")) {
                ctx.qry.grep = xstrdup(value);
                cgit_parse_url(value);
        } else if (!strcmp(name, "qt")) {
                ctx.qry.grep = xstrdup(value);


@@ -131,13 +204,28 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);
                ctx.qry.path = trim_end(value, '/');
        } else if (!strcmp(name, "name")) {
                ctx.qry.name = xstrdup(value);

+       } else if (!strcmp(name, "mimetype")) {
+               ctx.qry.mimetype = xstrdup(value);
+       } else if (!strcmp(name, "s")){
+               ctx.qry.sort = xstrdup(value);
+       } else if (!strcmp(name, "showmsg")) {
+               ctx.qry.showmsg = atoi(value);
+       } else if (!strcmp(name, "period")) {
+               ctx.qry.period = xstrdup(value);

        }
 }
 
        }
 }
 

+char *xstrdupn(const char *str)
+{
+       return (str ? xstrdup(str) : NULL);
+}
+

 static void prepare_context(struct cgit_context *ctx)
 {
        memset(ctx, 0, sizeof(ctx));
        ctx->cfg.agefile = "info/web/last-modified";
 static void prepare_context(struct cgit_context *ctx)
 {
        memset(ctx, 0, sizeof(ctx));
        ctx->cfg.agefile = "info/web/last-modified";

+       ctx->cfg.nocache = 0;
+       ctx->cfg.cache_size = 0;

        ctx->cfg.cache_dynamic_ttl = 5;
        ctx->cfg.cache_max_create_time = 5;
        ctx->cfg.cache_repo_ttl = 5;
        ctx->cfg.cache_dynamic_ttl = 5;
        ctx->cfg.cache_max_create_time = 5;
        ctx->cfg.cache_repo_ttl = 5;


@@ -146,57 +234,45 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/git-logo.png";
        ctx->cfg.cache_static_ttl = -1;
        ctx->cfg.css = "/cgit.css";
        ctx->cfg.logo = "/git-logo.png";

+       ctx->cfg.local_time = 0;
+       ctx->cfg.max_repo_count = 50;

        ctx->cfg.max_commit_count = 50;
        ctx->cfg.max_lock_attempts = 5;
        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.max_msg_len = 80;
+       ctx->cfg.max_repodesc_len = 80;
+       ctx->cfg.max_stats = 0;

        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.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.root_desc = "a fast webinterface for the git dscm";

        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
        ctx->cfg.script_name = CGIT_SCRIPT_NAME;

+       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.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.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;
+       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 {
 }
 
 struct refmatch {


@@ -221,15 +297,19 @@ int find_current_ref(const char *refname, const unsigned char *sha1,
 char *find_default_branch(struct cgit_repo *repo)
 {
        struct refmatch info;
 char *find_default_branch(struct cgit_repo *repo)
 {
        struct refmatch info;

+       char *ref;

 
        info.req_ref = repo->defbranch;
        info.first_ref = NULL;
        info.match = 0;
        for_each_branch_ref(find_current_ref, &info);
        if (info.match)
 
        info.req_ref = repo->defbranch;
        info.first_ref = NULL;
        info.match = 0;
        for_each_branch_ref(find_current_ref, &info);
        if (info.match)

-               return info.req_ref;
+               ref = info.req_ref;

        else
        else

-               return info.first_ref;
+               ref = info.first_ref;
+       if (ref)
+               ref = xstrdup(ref);
+       return ref;

 }
 
 static int prepare_repo_cmd(struct cgit_context *ctx)
 }
 
 static int prepare_repo_cmd(struct cgit_context *ctx)


@@ -255,7 +335,8 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->qry.head) {
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->qry.head) {

-               ctx->qry.head = xstrdup(find_default_branch(ctx->repo));
+               ctx->qry.nohead = 1;
+               ctx->qry.head = find_default_branch(ctx->repo);

                ctx->repo->defbranch = ctx->qry.head;
        }
 
                ctx->repo->defbranch = ctx->qry.head;
        }
 


@@ -271,6 +352,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;
        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);
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);


@@ -281,14 +364,14 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        return 0;
 }
 
        return 0;
 }
 

-static void process_request(struct cgit_context *ctx)
+static void process_request(void *cbdata)

 {
 {

+       struct cgit_context *ctx = cbdata;

        struct cgit_cmd *cmd;
 
        cmd = cgit_get_cmd(ctx);
        if (!cmd) {
                ctx->page.title = "cgit error";
        struct cgit_cmd *cmd;
 
        cmd = cgit_get_cmd(ctx);
        if (!cmd) {
                ctx->page.title = "cgit error";

-               ctx->repo = NULL;

                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);


@@ -297,7 +380,16 @@ static void process_request(struct cgit_context *ctx)
                return;
        }
 
                return;
        }
 

-       if (cmd->want_repo && prepare_repo_cmd(ctx))
+       if (cmd->want_repo && !ctx->repo) {
+               cgit_print_http_headers(ctx);
+               cgit_print_docstart(ctx);
+               cgit_print_pageheader(ctx);
+               cgit_print_error(fmt("No repository selected"));
+               cgit_print_docend();
+               return;
+       }
+
+       if (ctx->repo && prepare_repo_cmd(ctx))

                return;
 
        if (cmd->want_layout) {
                return;
 
        if (cmd->want_layout) {


@@ -312,85 +404,39 @@ static void process_request(struct cgit_context *ctx)
                cgit_print_docend();
 }
 
                cgit_print_docend();
 }
 

-static long ttl_seconds(long ttl)
+int cmp_repos(const void *a, const void *b)

 {
 {

-       if (ttl<0)
-               return 60 * 60 * 24 * 365;
-       else
-               return ttl * 60;
+       const struct cgit_repo *ra = a, *rb = b;
+       return strcmp(ra->url, rb->url);

 }
 
 }
 

-static void cgit_fill_cache(struct cacheitem *item, int use_cache)
+void print_repo(struct cgit_repo *repo)

 {
 {

-       int stdout2;
-
-       if (use_cache) {
-               stdout2 = chk_positive(dup(STDOUT_FILENO),
-                                      "Preserving STDOUT");
-               chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
-               chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
-       }
-
-       ctx.page.modified = time(NULL);
-       ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl);
-       process_request(&ctx);
-
-       if (use_cache) {
-               chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
-               chk_positive(dup2(stdout2, STDOUT_FILENO),
-                            "Restoring original STDOUT");
-               chk_zero(close(stdout2), "Closing temporary STDOUT");
-       }
+       printf("repo.url=%s\n", repo->url);
+       printf("repo.name=%s\n", repo->name);
+       printf("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);
+       if (repo->readme)
+               printf("repo.readme=%s\n", repo->readme);
+       printf("\n");

 }
 
 }
 

-static void cgit_check_cache(struct cacheitem *item)
+void print_repolist(struct cgit_repolist *list)

 {
 {

-       int i = 0;
+       int i;

 
 

- top:
-       if (++i > ctx.cfg.max_lock_attempts) {
-               die("cgit_refresh_cache: unable to lock %s: %s",
-                   item->name, strerror(errno));
-       }
-       if (!cache_exist(item)) {
-               if (!cache_lock(item)) {
-                       sleep(1);
-                       goto top;
-               }
-               if (!cache_exist(item)) {
-                       cgit_fill_cache(item, 1);
-                       cache_unlock(item);
-               } else {
-                       cache_cancel_lock(item);
-               }
-       } else if (cache_expired(item) && cache_lock(item)) {
-               if (cache_expired(item)) {
-                       cgit_fill_cache(item, 1);
-                       cache_unlock(item);
-               } else {
-                       cache_cancel_lock(item);
-               }
-       }
+       for(i = 0; i < list->count; i++)
+               print_repo(&list->repos[i]);

 }
 
 }
 

-static void cgit_print_cache(struct cacheitem *item)
-{
-       static char buf[4096];
-       ssize_t i;
-
-       int fd = open(item->name, O_RDONLY);
-       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;
 
 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;

+       int scan = 0;

 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {


@@ -419,35 +465,87 @@ static void cgit_parse_args(int argc, const char **argv)
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.ofs = atoi(argv[i]+6);
                }
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.ofs = atoi(argv[i]+6);
                }

+               if (!strncmp(argv[i], "--scan-tree=", 12)) {
+                       scan++;
+                       scan_tree(argv[i] + 12);
+               }
+       }
+       if (scan) {
+               qsort(cgit_repolist.repos, cgit_repolist.count,
+                       sizeof(struct cgit_repo), cmp_repos);
+               print_repolist(&cgit_repolist);
+               exit(0);

        }
 }
 
        }
 }
 

+static int calc_ttl()
+{
+       if (!ctx.repo)
+               return ctx.cfg.cache_root_ttl;
+
+       if (!ctx.qry.page)
+               return ctx.cfg.cache_repo_ttl;
+
+       if (ctx.qry.has_symref)
+               return ctx.cfg.cache_dynamic_ttl;
+
+       if (ctx.qry.has_sha1)
+               return ctx.cfg.cache_static_ttl;
+
+       return ctx.cfg.cache_repo_ttl;
+}
+

 int main(int argc, const char **argv)
 {
 int main(int argc, const char **argv)
 {

-       struct cacheitem item;
-       const char *cgit_config_env = getenv("CGIT_CONFIG");
+       const char *path;
+       char *qry;
+       int err, ttl;

 
        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_repolist.length = 0;
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
 

-       cgit_read_config(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
-                        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_args(argc, argv);

-       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);
+       parse_configfile(ctx.env.cgit_config, config_cb);
+       ctx.repo = NULL;
+       http_parse_querystring(ctx.qry.raw, querystring_cb);
+
+       /* If virtual-root isn't specified in cgitrc, lets pretend
+        * that virtual-root equals SCRIPT_NAME.
+        */
+       if (!ctx.cfg.virtual_root)
+               ctx.cfg.virtual_root = ctx.cfg.script_name;
+
+       /* If no url parameter is specified on the querystring, lets
+        * use PATH_INFO as url. This allows cgit to work with virtual
+        * urls without the need for rewriterules in the webserver (as
+        * long as PATH_INFO is included in the cache lookup key).
+        */
+       path = ctx.env.path_info;
+       if (!ctx.qry.url && path) {
+               if (path[0] == '/')
+                       path++;
+               ctx.qry.url = xstrdup(path);
+               if (ctx.qry.raw) {
+                       qry = ctx.qry.raw;
+                       ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
+                       free(qry);
+               } else
+                       ctx.qry.raw = ctx.qry.url;
+               cgit_parse_url(ctx.qry.url);

        }
        }

-       return 0;
+
+       ttl = calc_ttl();
+       ctx.page.expires += ttl*60;
+       if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
+               ctx.cfg.nocache = 1;
+       if (ctx.cfg.nocache)
+               ctx.cfg.cache_size = 0;
+       err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
+                           ctx.qry.raw, ttl, process_request, &ctx);
+       if (err)
+               cgit_print_error(fmt("Error processing page: %s (%d)",
+                                    strerror(err), err));
+       return err;

 }
 }