|
diff --git a/cache.c b/cache.c index 7cdea9b..372e38d 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -1,90 +1,95 @@ |
1 | /* cache.c: cache management |
1 | /* cache.c: cache management |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | const int NOLOCK = -1; |
11 | const int NOLOCK = -1; |
12 | |
12 | |
13 | char *cache_safe_filename(const char *unsafe) |
13 | char *cache_safe_filename(const char *unsafe) |
14 | { |
14 | { |
15 | static char buf[PATH_MAX]; |
15 | static char buf[4][PATH_MAX]; |
16 | char *s = buf; |
16 | static int bufidx; |
| |
17 | char *s; |
17 | char c; |
18 | char c; |
18 | |
19 | |
| |
20 | bufidx++; |
| |
21 | bufidx &= 3; |
| |
22 | s = buf[bufidx]; |
| |
23 | |
19 | while(unsafe && (c = *unsafe++) != 0) { |
24 | while(unsafe && (c = *unsafe++) != 0) { |
20 | if (c == '/' || c == ' ' || c == '&' || c == '|' || |
25 | if (c == '/' || c == ' ' || c == '&' || c == '|' || |
21 | c == '>' || c == '<' || c == '.') |
26 | c == '>' || c == '<' || c == '.') |
22 | c = '_'; |
27 | c = '_'; |
23 | *s++ = c; |
28 | *s++ = c; |
24 | } |
29 | } |
25 | *s = '\0'; |
30 | *s = '\0'; |
26 | return buf; |
31 | return buf[bufidx]; |
27 | } |
32 | } |
28 | |
33 | |
29 | int cache_exist(struct cacheitem *item) |
34 | int cache_exist(struct cacheitem *item) |
30 | { |
35 | { |
31 | if (stat(item->name, &item->st)) { |
36 | if (stat(item->name, &item->st)) { |
32 | item->st.st_mtime = 0; |
37 | item->st.st_mtime = 0; |
33 | return 0; |
38 | return 0; |
34 | } |
39 | } |
35 | return 1; |
40 | return 1; |
36 | } |
41 | } |
37 | |
42 | |
38 | int cache_create_dirs() |
43 | int cache_create_dirs() |
39 | { |
44 | { |
40 | char *path; |
45 | char *path; |
41 | |
46 | |
42 | path = fmt("%s", cgit_cache_root); |
47 | path = fmt("%s", cgit_cache_root); |
43 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
48 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
44 | return 0; |
49 | return 0; |
45 | |
50 | |
46 | if (!cgit_repo) |
51 | if (!cgit_repo) |
47 | return 0; |
52 | return 0; |
48 | |
53 | |
49 | path = fmt("%s/%s", cgit_cache_root, |
54 | path = fmt("%s/%s", cgit_cache_root, |
50 | cache_safe_filename(cgit_repo->url)); |
55 | cache_safe_filename(cgit_repo->url)); |
51 | |
56 | |
52 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
57 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
53 | return 0; |
58 | return 0; |
54 | |
59 | |
55 | if (cgit_query_page) { |
60 | if (cgit_query_page) { |
56 | path = fmt("%s/%s/%s", cgit_cache_root, |
61 | path = fmt("%s/%s/%s", cgit_cache_root, |
57 | cache_safe_filename(cgit_repo->url), |
62 | cache_safe_filename(cgit_repo->url), |
58 | cgit_query_page); |
63 | cgit_query_page); |
59 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
64 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
60 | return 0; |
65 | return 0; |
61 | } |
66 | } |
62 | return 1; |
67 | return 1; |
63 | } |
68 | } |
64 | |
69 | |
65 | int cache_refill_overdue(const char *lockfile) |
70 | int cache_refill_overdue(const char *lockfile) |
66 | { |
71 | { |
67 | struct stat st; |
72 | struct stat st; |
68 | |
73 | |
69 | if (stat(lockfile, &st)) |
74 | if (stat(lockfile, &st)) |
70 | return 0; |
75 | return 0; |
71 | else |
76 | else |
72 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
77 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
73 | } |
78 | } |
74 | |
79 | |
75 | int cache_lock(struct cacheitem *item) |
80 | int cache_lock(struct cacheitem *item) |
76 | { |
81 | { |
77 | int i = 0; |
82 | int i = 0; |
78 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
83 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
79 | |
84 | |
80 | top: |
85 | top: |
81 | if (++i > cgit_max_lock_attempts) |
86 | if (++i > cgit_max_lock_attempts) |
82 | die("cache_lock: unable to lock %s: %s", |
87 | die("cache_lock: unable to lock %s: %s", |
83 | item->name, strerror(errno)); |
88 | item->name, strerror(errno)); |
84 | |
89 | |
85 | 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); |
86 | |
91 | |
87 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
92 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
88 | goto top; |
93 | goto top; |
89 | |
94 | |
90 | if (item->fd == NOLOCK && errno == EEXIST && |
95 | if (item->fd == NOLOCK && errno == EEXIST && |
|