diff options
| -rw-r--r-- | cache.c | 22 | ||||
| -rw-r--r-- | cgit.c | 25 | ||||
| -rw-r--r-- | cgit.h | 1 |
3 files changed, 23 insertions, 25 deletions
diff --git a/cache.c b/cache.c index 91b89a6..1ff1251 100644 --- a/cache.c +++ b/cache.c @@ -10,28 +10,6 @@ const int NOLOCK = -1; -void cache_prepare(struct cacheitem *item) -{ - if (!cgit_query_repo) { - item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); - item->ttl = cgit_cache_root_ttl; - } else if (!cgit_query_page) { - item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, - cgit_query_repo)); - item->ttl = cgit_cache_repo_ttl; - } else { - item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, - cgit_query_repo, cgit_query_page, - cgit_querystring)); - if (cgit_query_has_symref) - item->ttl = cgit_cache_dynamic_ttl; - else if (cgit_query_has_sha1) - item->ttl = cgit_cache_static_ttl; - else - item->ttl = cgit_cache_repo_ttl; - } -} - int cache_exist(struct cacheitem *item) { if (stat(item->name, &item->st)) { diff --git a/cgit.c b/cgit.c index 5dcba76..d975570 100644 --- a/cgit.c +++ b/cgit.c @@ -10,6 +10,28 @@ const char cgit_version[] = CGIT_VERSION; +static void cgit_prepare_cache(struct cacheitem *item) +{ + if (!cgit_query_repo) { + item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); + item->ttl = cgit_cache_root_ttl; + } else if (!cgit_query_page) { + item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, + cgit_query_repo)); + item->ttl = cgit_cache_repo_ttl; + } else { + item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, + cgit_query_repo, cgit_query_page, + cgit_querystring)); + if (cgit_query_has_symref) + item->ttl = cgit_cache_dynamic_ttl; + else if (cgit_query_has_sha1) + item->ttl = cgit_cache_static_ttl; + else + item->ttl = cgit_cache_repo_ttl; + } +} + static void cgit_print_repo_page(struct cacheitem *item) { if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || @@ -63,7 +85,6 @@ static void cgit_check_cache(struct cacheitem *item) { int i = 0; - cache_prepare(item); top: if (++i > cgit_max_lock_attempts) { die("cgit_refresh_cache: unable to lock %s: %s", @@ -152,8 +173,8 @@ int main(int argc, const char **argv) cgit_parse_args(argc, argv); cgit_parse_query(cgit_querystring, cgit_querystring_cb); + cgit_prepare_cache(&item); if (cgit_nocache) { - cache_prepare(&item); item.fd = STDOUT_FILENO; cgit_fill_cache(&item); } else { diff --git a/cgit.h b/cgit.h index eb8f08c..f915c86 100644 --- a/cgit.h +++ b/cgit.h @@ -87,7 +87,6 @@ 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 void cache_prepare(struct cacheitem *item); extern int cache_lock(struct cacheitem *item); extern int cache_unlock(struct cacheitem *item); extern int cache_cancel_lock(struct cacheitem *item); |