1 files changed, 11 insertions, 10 deletions

diff --git a/cache.c b/cache.c
index 372e38d..89f7ecd 100644
--- a/cache.c
+++ b/cache.c
@@ -6,8 +6,9 @@
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "cache.h"
 
 const int NOLOCK = -1;
 
 char *cache_safe_filename(const char *unsafe)
@@ -43,25 +44,25 @@ int cache_exist(struct cacheitem *item)
 int cache_create_dirs()
 {
         char *path;
 
-        path = fmt("%s", cgit_cache_root);
+        path = fmt("%s", ctx.cfg.cache_root);
         if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                 return 0;
 
-        if (!cgit_repo)
+        if (!ctx.repo)
                 return 0;
 
-        path = fmt("%s/%s", cgit_cache_root,
-                   cache_safe_filename(cgit_repo->url));
+        path = fmt("%s/%s", ctx.cfg.cache_root,
+                   cache_safe_filename(ctx.repo->url));
 
         if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                 return 0;
 
-        if (cgit_query_page) {
-                path = fmt("%s/%s/%s", cgit_cache_root,
-                           cache_safe_filename(cgit_repo->url),
-                           cgit_query_page);
+        if (ctx.qry.page) {
+                path = fmt("%s/%s/%s", ctx.cfg.cache_root,
+                           cache_safe_filename(ctx.repo->url),
+                           ctx.qry.page);
                 if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                         return 0;
         }
         return 1;
@@ -73,18 +74,18 @@ int cache_refill_overdue(const char *lockfile)
 
         if (stat(lockfile, &st))
                 return 0;
         else
-                return (time(NULL) - st.st_mtime > cgit_cache_max_create_time);
+                return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time);
 }
 
 int cache_lock(struct cacheitem *item)
 {
         int i = 0;
         char *lockfile = xstrdup(fmt("%s.lock", item->name));
 
  top:
-        if (++i > cgit_max_lock_attempts)
+        if (++i > ctx.cfg.max_lock_attempts)
                 die("cache_lock: unable to lock %s: %s",
                     item->name, strerror(errno));
 
                item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR);