Add all config variables into struct cgit_context

[ps-cgit] / cache.c

diff --git a/cache.c b/cache.c
index b1629523e6594b115053b7d2f74b20f78f4e3ca2..2ed0d6f790f059ef8bb06982caac0c94d0c3c759 100644 (file)
--- a/cache.c
+++ b/cache.c
@@ -44,21 +44,21 @@ int cache_create_dirs()
 {
        char *path;
 
 {
        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)
                return 0;
 
        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                return 0;
 
        if (!cgit_repo)
                return 0;
 

-       path = fmt("%s/%s", cgit_cache_root,
+       path = fmt("%s/%s", ctx.cfg.cache_root,

                   cache_safe_filename(cgit_repo->url));
 
        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                return 0;
 
        if (ctx.qry.page) {
                   cache_safe_filename(cgit_repo->url));
 
        if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                return 0;
 
        if (ctx.qry.page) {

-               path = fmt("%s/%s/%s", cgit_cache_root,
+               path = fmt("%s/%s/%s", ctx.cfg.cache_root,

                           cache_safe_filename(cgit_repo->url),
                           ctx.qry.page);
                if (mkdir(path, S_IRWXU) && errno!=EEXIST)
                           cache_safe_filename(cgit_repo->url),
                           ctx.qry.page);
                if (mkdir(path, S_IRWXU) && errno!=EEXIST)


@@ -74,7 +74,7 @@ int cache_refill_overdue(const char *lockfile)
        if (stat(lockfile, &st))
                return 0;
        else
        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 cache_lock(struct cacheitem *item)


@@ -83,7 +83,7 @@ int cache_lock(struct cacheitem *item)
        char *lockfile = xstrdup(fmt("%s.lock", item->name));
 
  top:
        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));
 
                die("cache_lock: unable to lock %s: %s",
                    item->name, strerror(errno));