author | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 01:00:54 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:51:01 (UTC) |
commit | 30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de (patch) (unidiff) | |
tree | efb3eddd091117281d5592c9eab44bc63121edf6 /cache.c | |
parent | 43d40f2b704151d145a1383b2b964210915ecae4 (diff) | |
download | cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.zip cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.gz cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.bz2 |
Enable url=value querystring parameter
This makes is possible to use repo-urls like '/pub/scm/git/git.git' and
even add path specifications, like '/pub/scm/git/git.git/log/documentation'.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cache.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -22,57 +22,60 @@ char *cache_safe_filename(const char *unsafe) | |||
22 | c = '_'; | 22 | c = '_'; |
23 | *s++ = c; | 23 | *s++ = c; |
24 | } | 24 | } |
25 | *s = '\0'; | 25 | *s = '\0'; |
26 | return buf; | 26 | return buf; |
27 | } | 27 | } |
28 | 28 | ||
29 | int cache_exist(struct cacheitem *item) | 29 | int cache_exist(struct cacheitem *item) |
30 | { | 30 | { |
31 | if (stat(item->name, &item->st)) { | 31 | if (stat(item->name, &item->st)) { |
32 | item->st.st_mtime = 0; | 32 | item->st.st_mtime = 0; |
33 | return 0; | 33 | return 0; |
34 | } | 34 | } |
35 | return 1; | 35 | return 1; |
36 | } | 36 | } |
37 | 37 | ||
38 | int cache_create_dirs() | 38 | int cache_create_dirs() |
39 | { | 39 | { |
40 | char *path; | 40 | char *path; |
41 | 41 | ||
42 | path = fmt("%s", cgit_cache_root); | 42 | path = fmt("%s", cgit_cache_root); |
43 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 43 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
44 | return 0; | 44 | return 0; |
45 | 45 | ||
46 | if (!cgit_query_repo) | 46 | if (!cgit_repo) |
47 | return 0; | 47 | return 0; |
48 | 48 | ||
49 | path = fmt("%s/%s", cgit_cache_root, cgit_query_repo); | 49 | path = fmt("%s/%s", cgit_cache_root, |
50 | cache_safe_filename(cgit_repo->url)); | ||
51 | |||
50 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 52 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
51 | return 0; | 53 | return 0; |
52 | 54 | ||
53 | if (cgit_query_page) { | 55 | if (cgit_query_page) { |
54 | path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, | 56 | path = fmt("%s/%s/%s", cgit_cache_root, |
57 | cache_safe_filename(cgit_repo->url), | ||
55 | cgit_query_page); | 58 | cgit_query_page); |
56 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 59 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
57 | return 0; | 60 | return 0; |
58 | } | 61 | } |
59 | return 1; | 62 | return 1; |
60 | } | 63 | } |
61 | 64 | ||
62 | int cache_refill_overdue(const char *lockfile) | 65 | int cache_refill_overdue(const char *lockfile) |
63 | { | 66 | { |
64 | struct stat st; | 67 | struct stat st; |
65 | 68 | ||
66 | if (stat(lockfile, &st)) | 69 | if (stat(lockfile, &st)) |
67 | return 0; | 70 | return 0; |
68 | else | 71 | else |
69 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); | 72 | return (time(NULL) - st.st_mtime > cgit_cache_max_create_time); |
70 | } | 73 | } |
71 | 74 | ||
72 | int cache_lock(struct cacheitem *item) | 75 | int cache_lock(struct cacheitem *item) |
73 | { | 76 | { |
74 | int i = 0; | 77 | int i = 0; |
75 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); | 78 | char *lockfile = xstrdup(fmt("%s.lock", item->name)); |
76 | 79 | ||
77 | top: | 80 | top: |
78 | if (++i > cgit_max_lock_attempts) | 81 | if (++i > cgit_max_lock_attempts) |