|
diff --git a/cache.c b/cache.c index b947a34..39e63a5 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -69,32 +69,33 @@ int cache_refill_overdue(const char *lockfile) |
69 | return 0; |
69 | return 0; |
70 | else |
70 | else |
71 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
71 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
72 | } |
72 | } |
73 | |
73 | |
74 | int cache_lock(struct cacheitem *item) |
74 | int cache_lock(struct cacheitem *item) |
75 | { |
75 | { |
76 | int i = 0; |
76 | int i = 0; |
77 | char *lockfile = fmt("%s.lock", item->name); |
77 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
78 | |
78 | |
79 | top: |
79 | top: |
80 | if (++i > cgit_max_lock_attempts) |
80 | if (++i > cgit_max_lock_attempts) |
81 | die("cache_lock: unable to lock %s: %s", |
81 | die("cache_lock: unable to lock %s: %s", |
82 | item->name, strerror(errno)); |
82 | item->name, strerror(errno)); |
83 | |
83 | |
84 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); |
84 | item->fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL, S_IRUSR|S_IWUSR); |
85 | |
85 | |
86 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
86 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
87 | goto top; |
87 | goto top; |
88 | |
88 | |
89 | if (item->fd == NOLOCK && errno == EEXIST && |
89 | if (item->fd == NOLOCK && errno == EEXIST && |
90 | cache_refill_overdue(lockfile) && !unlink(lockfile)) |
90 | cache_refill_overdue(lockfile) && !unlink(lockfile)) |
91 | goto top; |
91 | goto top; |
92 | |
92 | |
| |
93 | free(lockfile); |
93 | return (item->fd > 0); |
94 | return (item->fd > 0); |
94 | } |
95 | } |
95 | |
96 | |
96 | int cache_unlock(struct cacheitem *item) |
97 | int cache_unlock(struct cacheitem *item) |
97 | { |
98 | { |
98 | close(item->fd); |
99 | close(item->fd); |
99 | return (rename(fmt("%s.lock", item->name), item->name) == 0); |
100 | return (rename(fmt("%s.lock", item->name), item->name) == 0); |
100 | } |
101 | } |
|