author | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:29:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:29:21 (UTC) |
commit | 23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch) (unidiff) | |
tree | 136493d8228b0ff4971feb06b0e8aee296367b00 /cache.c | |
parent | e2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff) | |
parent | c6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff) | |
download | cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.bz2 |
Merge branch 'lh/cleanup'
* lh/cleanup: (21 commits)
Reset ctx.repo to NULL when the config parser is finished
Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
Move function for configfile parsing into configfile.[ch]
Add cache.h
Remove global and obsolete cgit_cmd
Makefile: copy the QUIET constructs from the Makefile in git.git
Move cgit_version from shared.c to cgit.c
Makefile: autobuild dependency rules
Initial Makefile cleanup
Move non-generic functions from shared.c to cgit.c
Add ui-shared.h
Add separate header-files for each page/view
Refactor snapshot support
Add command dispatcher
Remove obsolete cacheitem parameter to ui-functions
Add struct cgit_page to cgit_context
Introduce html.h
Improve initialization of git directory
Move cgit_repo into cgit_context
Add all config variables into struct cgit_context
...
-rw-r--r-- | cache.c | 21 |
1 files changed, 11 insertions, 10 deletions
@@ -1,110 +1,111 @@ | |||
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 | #include "cache.h" | ||
10 | 11 | ||
11 | const int NOLOCK = -1; | 12 | const int NOLOCK = -1; |
12 | 13 | ||
13 | char *cache_safe_filename(const char *unsafe) | 14 | char *cache_safe_filename(const char *unsafe) |
14 | { | 15 | { |
15 | static char buf[4][PATH_MAX]; | 16 | static char buf[4][PATH_MAX]; |
16 | static int bufidx; | 17 | static int bufidx; |
17 | char *s; | 18 | char *s; |
18 | char c; | 19 | char c; |
19 | 20 | ||
20 | bufidx++; | 21 | bufidx++; |
21 | bufidx &= 3; | 22 | bufidx &= 3; |
22 | s = buf[bufidx]; | 23 | s = buf[bufidx]; |
23 | 24 | ||
24 | while(unsafe && (c = *unsafe++) != 0) { | 25 | while(unsafe && (c = *unsafe++) != 0) { |
25 | if (c == '/' || c == ' ' || c == '&' || c == '|' || | 26 | if (c == '/' || c == ' ' || c == '&' || c == '|' || |
26 | c == '>' || c == '<' || c == '.') | 27 | c == '>' || c == '<' || c == '.') |
27 | c = '_'; | 28 | c = '_'; |
28 | *s++ = c; | 29 | *s++ = c; |
29 | } | 30 | } |
30 | *s = '\0'; | 31 | *s = '\0'; |
31 | return buf[bufidx]; | 32 | return buf[bufidx]; |
32 | } | 33 | } |
33 | 34 | ||
34 | int cache_exist(struct cacheitem *item) | 35 | int cache_exist(struct cacheitem *item) |
35 | { | 36 | { |
36 | if (stat(item->name, &item->st)) { | 37 | if (stat(item->name, &item->st)) { |
37 | item->st.st_mtime = 0; | 38 | item->st.st_mtime = 0; |
38 | return 0; | 39 | return 0; |
39 | } | 40 | } |
40 | return 1; | 41 | return 1; |
41 | } | 42 | } |
42 | 43 | ||
43 | int cache_create_dirs() | 44 | int cache_create_dirs() |
44 | { | 45 | { |
45 | char *path; | 46 | char *path; |
46 | 47 | ||
47 | path = fmt("%s", cgit_cache_root); | 48 | path = fmt("%s", ctx.cfg.cache_root); |
48 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 49 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
49 | return 0; | 50 | return 0; |
50 | 51 | ||
51 | if (!cgit_repo) | 52 | if (!ctx.repo) |
52 | return 0; | 53 | return 0; |
53 | 54 | ||
54 | path = fmt("%s/%s", cgit_cache_root, | 55 | path = fmt("%s/%s", ctx.cfg.cache_root, |
55 | cache_safe_filename(cgit_repo->url)); | 56 | cache_safe_filename(ctx.repo->url)); |
56 | 57 | ||
57 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 58 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
58 | return 0; | 59 | return 0; |
59 | 60 | ||
60 | if (cgit_query_page) { | 61 | if (ctx.qry.page) { |
61 | path = fmt("%s/%s/%s", cgit_cache_root, | 62 | path = fmt("%s/%s/%s", ctx.cfg.cache_root, |
62 | cache_safe_filename(cgit_repo->url), | 63 | cache_safe_filename(ctx.repo->url), |
63 | cgit_query_page); | 64 | ctx.qry.page); |
64 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 65 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
65 | return 0; | 66 | return 0; |
66 | } | 67 | } |
67 | return 1; | 68 | return 1; |
68 | } | 69 | } |
69 | 70 | ||
70 | int cache_refill_overdue(const char *lockfile) | 71 | int cache_refill_overdue(const char *lockfile) |
71 | { | 72 | { |
72 | struct stat st; | 73 | struct stat st; |
73 | 74 | ||
74 | if (stat(lockfile, &st)) | 75 | if (stat(lockfile, &st)) |
75 | return 0; | 76 | return 0; |
76 | else | 77 | else |
77 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); | 78 | return (time(NULL) - st.st_mtime > ctx.cfg.cache_max_create_time); |
78 | } | 79 | } |
79 | 80 | ||
80 | int cache_lock(struct cacheitem *item) | 81 | int cache_lock(struct cacheitem *item) |
81 | { | 82 | { |
82 | int i = 0; | 83 | int i = 0; |
83 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); | 84 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
84 | 85 | ||
85 | top: | 86 | top: |
86 | if (++i > cgit_max_lock_attempts) | 87 | if (++i > ctx.cfg.max_lock_attempts) |
87 | die("cache_lock: unable to lock %s: %s", | 88 | die("cache_lock: unable to lock %s: %s", |
88 | item->name, strerror(errno)); | 89 | item->name, strerror(errno)); |
89 | 90 | ||
90 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); | 91 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); |
91 | 92 | ||
92 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) | 93 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
93 | goto top; | 94 | goto top; |
94 | 95 | ||
95 | if (item->fd == NOLOCK && errno == EEXIST && | 96 | if (item->fd == NOLOCK && errno == EEXIST && |
96 | cache_refill_overdue(lockfile) && !unlink(lockfile)) | 97 | cache_refill_overdue(lockfile) && !unlink(lockfile)) |
97 | goto top; | 98 | goto top; |
98 | 99 | ||
99 | free(lockfile); | 100 | free(lockfile); |
100 | return (item->fd > 0); | 101 | return (item->fd > 0); |
101 | } | 102 | } |
102 | 103 | ||
103 | int cache_unlock(struct cacheitem *item) | 104 | int cache_unlock(struct cacheitem *item) |
104 | { | 105 | { |
105 | close(item->fd); | 106 | close(item->fd); |
106 | return (rename(fmt("%s.lock", item->name), item->name) == 0); | 107 | return (rename(fmt("%s.lock", item->name), item->name) == 0); |
107 | } | 108 | } |
108 | 109 | ||
109 | int cache_cancel_lock(struct cacheitem *item) | 110 | int cache_cancel_lock(struct cacheitem *item) |
110 | { | 111 | { |