|
diff --git a/cache.c b/cache.c index b162952..2ed0d6f 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -41,27 +41,27 @@ int cache_exist(struct cacheitem *item) |
41 | } |
41 | } |
42 | |
42 | |
43 | int cache_create_dirs() |
43 | int cache_create_dirs() |
44 | { |
44 | { |
45 | char *path; |
45 | char *path; |
46 | |
46 | |
47 | path = fmt("%s", cgit_cache_root); |
47 | path = fmt("%s", ctx.cfg.cache_root); |
48 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
48 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
49 | return 0; |
49 | return 0; |
50 | |
50 | |
51 | if (!cgit_repo) |
51 | if (!cgit_repo) |
52 | return 0; |
52 | return 0; |
53 | |
53 | |
54 | path = fmt("%s/%s", cgit_cache_root, |
54 | path = fmt("%s/%s", ctx.cfg.cache_root, |
55 | cache_safe_filename(cgit_repo->url)); |
55 | cache_safe_filename(cgit_repo->url)); |
56 | |
56 | |
57 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
57 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
58 | return 0; |
58 | return 0; |
59 | |
59 | |
60 | if (ctx.qry.page) { |
60 | if (ctx.qry.page) { |
61 | path = fmt("%s/%s/%s", cgit_cache_root, |
61 | path = fmt("%s/%s/%s", ctx.cfg.cache_root, |
62 | cache_safe_filename(cgit_repo->url), |
62 | cache_safe_filename(cgit_repo->url), |
63 | ctx.qry.page); |
63 | ctx.qry.page); |
64 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
64 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
65 | return 0; |
65 | return 0; |
66 | } |
66 | } |
67 | return 1; |
67 | return 1; |
@@ -71,22 +71,22 @@ int cache_refill_overdue(const char *lockfile) |
71 | { |
71 | { |
72 | struct stat st; |
72 | struct stat st; |
73 | |
73 | |
74 | if (stat(lockfile, &st)) |
74 | if (stat(lockfile, &st)) |
75 | return 0; |
75 | return 0; |
76 | else |
76 | else |
77 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
77 | return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time); |
78 | } |
78 | } |
79 | |
79 | |
80 | int cache_lock(struct cacheitem *item) |
80 | int cache_lock(struct cacheitem *item) |
81 | { |
81 | { |
82 | int i = 0; |
82 | int i = 0; |
83 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
83 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
84 | |
84 | |
85 | top: |
85 | top: |
86 | if (++i > cgit_max_lock_attempts) |
86 | if (++i > ctx.cfg.max_lock_attempts) |
87 | die("cache_lock: unable to lock %s: %s", |
87 | die("cache_lock: unable to lock %s: %s", |
88 | item->name, strerror(errno)); |
88 | item->name, strerror(errno)); |
89 | |
89 | |
90 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); |
90 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); |
91 | |
91 | |
92 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
92 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
|