|
diff --git a/cache.c b/cache.c index 7860fc7..89f7ecd 100644 --- a/ cache.c+++ b/ cache.c |
|
@@ -2,16 +2,17 @@ |
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; |
|
|
diff --git a/cache.h b/cache.h new file mode 100644 index 0000000..4dcbea3 --- a/dev/null +++ b/ cache.h |
|
@@ -0,0 +1,23 @@ |
| |
1 | /* |
| |
2 | * Since git has it's own cache.h which we include, |
| |
3 | * lets test on CGIT_CACHE_H to avoid confusion |
| |
4 | */ |
| |
5 | |
| |
6 | #ifndef CGIT_CACHE_H |
| |
7 | #define CGIT_CACHE_H |
| |
8 | |
| |
9 | struct cacheitem { |
| |
10 | char *name; |
| |
11 | struct stat st; |
| |
12 | int ttl; |
| |
13 | int fd; |
| |
14 | }; |
| |
15 | |
| |
16 | extern char *cache_safe_filename(const char *unsafe); |
| |
17 | extern int cache_lock(struct cacheitem *item); |
| |
18 | extern int cache_unlock(struct cacheitem *item); |
| |
19 | extern int cache_cancel_lock(struct cacheitem *item); |
| |
20 | extern int cache_exist(struct cacheitem *item); |
| |
21 | extern int cache_expired(struct cacheitem *item); |
| |
22 | |
| |
23 | #endif /* CGIT_CACHE_H */ |
|
|
diff --git a/cgit.c b/cgit.c index f749b6b..73b1f02 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -2,16 +2,17 @@ |
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 | #include "cmd.h" |
11 | #include "cmd.h" |
11 | #include "ui-shared.h" |
12 | #include "ui-shared.h" |
12 | |
13 | |
13 | const char *cgit_version = CGIT_VERSION; |
14 | const char *cgit_version = CGIT_VERSION; |
14 | |
15 | |
15 | void config_cb(const char *name, const char *value) |
16 | void config_cb(const char *name, const char *value) |
16 | { |
17 | { |
17 | if (!strcmp(name, "root-title")) |
18 | if (!strcmp(name, "root-title")) |
|
|
diff --git a/cgit.h b/cgit.h index e82e9aa..f600912 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -41,23 +41,16 @@ |
41 | * Default encoding |
41 | * Default encoding |
42 | */ |
42 | */ |
43 | #define PAGE_ENCODING "UTF-8" |
43 | #define PAGE_ENCODING "UTF-8" |
44 | |
44 | |
45 | typedef void (*configfn)(const char *name, const char *value); |
45 | typedef void (*configfn)(const char *name, const char *value); |
46 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
46 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
47 | typedef void (*linediff_fn)(char *line, int len); |
47 | typedef void (*linediff_fn)(char *line, int len); |
48 | |
48 | |
49 | struct cacheitem { |
| |
50 | char *name; |
| |
51 | struct stat st; |
| |
52 | int ttl; |
| |
53 | int fd; |
| |
54 | }; |
| |
55 | |
| |
56 | struct cgit_repo { |
49 | struct cgit_repo { |
57 | char *url; |
50 | char *url; |
58 | char *name; |
51 | char *name; |
59 | char *path; |
52 | char *path; |
60 | char *desc; |
53 | char *desc; |
61 | char *owner; |
54 | char *owner; |
62 | char *defbranch; |
55 | char *defbranch; |
63 | char *group; |
56 | char *group; |
@@ -222,20 +215,13 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
222 | extern char *fmt(const char *format,...); |
215 | extern char *fmt(const char *format,...); |
223 | |
216 | |
224 | extern int cgit_read_config(const char *filename, configfn fn); |
217 | extern int cgit_read_config(const char *filename, configfn fn); |
225 | extern int cgit_parse_query(char *txt, configfn fn); |
218 | extern int cgit_parse_query(char *txt, configfn fn); |
226 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
219 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
227 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
220 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
228 | extern void cgit_parse_url(const char *url); |
221 | extern void cgit_parse_url(const char *url); |
229 | |
222 | |
230 | extern char *cache_safe_filename(const char *unsafe); |
| |
231 | extern int cache_lock(struct cacheitem *item); |
| |
232 | extern int cache_unlock(struct cacheitem *item); |
| |
233 | extern int cache_cancel_lock(struct cacheitem *item); |
| |
234 | extern int cache_exist(struct cacheitem *item); |
| |
235 | extern int cache_expired(struct cacheitem *item); |
| |
236 | |
| |
237 | extern const char *cgit_repobasename(const char *reponame); |
223 | extern const char *cgit_repobasename(const char *reponame); |
238 | |
224 | |
239 | extern int cgit_parse_snapshots_mask(const char *str); |
225 | extern int cgit_parse_snapshots_mask(const char *str); |
240 | |
226 | |
241 | #endif /* CGIT_H */ |
227 | #endif /* CGIT_H */ |
|