|
diff --git a/cgit.c b/cgit.c index 37cdb83..9dbc608 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -51,60 +51,104 @@ static void cgit_fill_cache(struct cacheitem *item) |
51 | } |
51 | } |
52 | |
52 | |
53 | static void cgit_check_cache(struct cacheitem *item) |
53 | static void cgit_check_cache(struct cacheitem *item) |
54 | { |
54 | { |
55 | int i = 0; |
55 | int i = 0; |
56 | |
56 | |
57 | cache_prepare(item); |
57 | cache_prepare(item); |
58 | top: |
58 | top: |
59 | if (++i > cgit_max_lock_attempts) { |
59 | if (++i > cgit_max_lock_attempts) { |
60 | die("cgit_refresh_cache: unable to lock %s: %s", |
60 | die("cgit_refresh_cache: unable to lock %s: %s", |
61 | item->name, strerror(errno)); |
61 | item->name, strerror(errno)); |
62 | } |
62 | } |
63 | if (!cache_exist(item)) { |
63 | if (!cache_exist(item)) { |
64 | if (!cache_lock(item)) { |
64 | if (!cache_lock(item)) { |
65 | sleep(1); |
65 | sleep(1); |
66 | goto top; |
66 | goto top; |
67 | } |
67 | } |
68 | if (!cache_exist(item)) { |
68 | if (!cache_exist(item)) { |
69 | cgit_fill_cache(item); |
69 | cgit_fill_cache(item); |
70 | cache_unlock(item); |
70 | cache_unlock(item); |
71 | } else { |
71 | } else { |
72 | cache_cancel_lock(item); |
72 | cache_cancel_lock(item); |
73 | } |
73 | } |
74 | } else if (cache_expired(item) && cache_lock(item)) { |
74 | } else if (cache_expired(item) && cache_lock(item)) { |
75 | if (cache_expired(item)) { |
75 | if (cache_expired(item)) { |
76 | cgit_fill_cache(item); |
76 | cgit_fill_cache(item); |
77 | cache_unlock(item); |
77 | cache_unlock(item); |
78 | } else { |
78 | } else { |
79 | cache_cancel_lock(item); |
79 | cache_cancel_lock(item); |
80 | } |
80 | } |
81 | } |
81 | } |
82 | } |
82 | } |
83 | |
83 | |
84 | static void cgit_print_cache(struct cacheitem *item) |
84 | static void cgit_print_cache(struct cacheitem *item) |
85 | { |
85 | { |
86 | static char buf[4096]; |
86 | static char buf[4096]; |
87 | ssize_t i; |
87 | ssize_t i; |
88 | |
88 | |
89 | int fd = open(item->name, O_RDONLY); |
89 | int fd = open(item->name, O_RDONLY); |
90 | if (fd<0) |
90 | if (fd<0) |
91 | die("Unable to open cached file %s", item->name); |
91 | die("Unable to open cached file %s", item->name); |
92 | |
92 | |
93 | while((i=read(fd, buf, sizeof(buf))) > 0) |
93 | while((i=read(fd, buf, sizeof(buf))) > 0) |
94 | write(STDOUT_FILENO, buf, i); |
94 | write(STDOUT_FILENO, buf, i); |
95 | |
95 | |
96 | close(fd); |
96 | close(fd); |
97 | } |
97 | } |
98 | |
98 | |
| |
99 | static void cgit_parse_args(int argc, const char **argv) |
| |
100 | { |
| |
101 | int i; |
| |
102 | |
| |
103 | for (i = 1; i < argc; i++) { |
| |
104 | if (!strncmp(argv[i], "--root=", 7)) { |
| |
105 | cgit_root = xstrdup(argv[i]+7); |
| |
106 | } |
| |
107 | if (!strncmp(argv[i], "--cache=", 8)) { |
| |
108 | cgit_cache_root = xstrdup(argv[i]+8); |
| |
109 | } |
| |
110 | if (!strcmp(argv[i], "--nocache")) { |
| |
111 | cgit_nocache = 1; |
| |
112 | } |
| |
113 | if (!strncmp(argv[i], "--query=", 8)) { |
| |
114 | cgit_querystring = xstrdup(argv[i]+8); |
| |
115 | } |
| |
116 | if (!strncmp(argv[i], "--repo=", 7)) { |
| |
117 | cgit_query_repo = xstrdup(argv[i]+7); |
| |
118 | } |
| |
119 | if (!strncmp(argv[i], "--page=", 7)) { |
| |
120 | cgit_query_page = xstrdup(argv[i]+7); |
| |
121 | } |
| |
122 | if (!strncmp(argv[i], "--head=", 7)) { |
| |
123 | cgit_query_head = xstrdup(argv[i]+7); |
| |
124 | cgit_query_has_symref = 1; |
| |
125 | } |
| |
126 | if (!strncmp(argv[i], "--sha1=", 7)) { |
| |
127 | cgit_query_sha1 = xstrdup(argv[i]+7); |
| |
128 | cgit_query_has_sha1 = 1; |
| |
129 | } |
| |
130 | if (!strncmp(argv[i], "--ofs=", 6)) { |
| |
131 | cgit_query_ofs = atoi(argv[i]+6); |
| |
132 | } |
| |
133 | } |
| |
134 | } |
| |
135 | |
99 | int main(int argc, const char **argv) |
136 | int main(int argc, const char **argv) |
100 | { |
137 | { |
101 | struct cacheitem item; |
138 | struct cacheitem item; |
102 | |
139 | |
103 | cgit_read_config("/etc/cgitrc", cgit_global_config_cb); |
140 | cgit_read_config("/etc/cgitrc", cgit_global_config_cb); |
104 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
141 | if (getenv("QUERY_STRING")) |
| |
142 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
| |
143 | cgit_parse_args(argc, argv); |
105 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); |
144 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); |
106 | |
145 | |
107 | cgit_check_cache(&item); |
146 | if (cgit_nocache) { |
108 | cgit_print_cache(&item); |
147 | item.fd = STDOUT_FILENO; |
| |
148 | cgit_fill_cache(&item); |
| |
149 | } else { |
| |
150 | cgit_check_cache(&item); |
| |
151 | cgit_print_cache(&item); |
| |
152 | } |
109 | return 0; |
153 | return 0; |
110 | } |
154 | } |
|
|
diff --git a/cgit.h b/cgit.h index a54f2b5..b6b60c6 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -1,83 +1,84 @@ |
1 | #ifndef CGIT_H |
1 | #ifndef CGIT_H |
2 | #define CGIT_H |
2 | #define CGIT_H |
3 | |
3 | |
4 | #include "git.h" |
4 | #include "git.h" |
5 | #include <openssl/sha.h> |
5 | #include <openssl/sha.h> |
6 | #include <ctype.h> |
6 | #include <ctype.h> |
7 | #include <sched.h> |
7 | #include <sched.h> |
8 | |
8 | |
9 | typedef void (*configfn)(const char *name, const char *value); |
9 | typedef void (*configfn)(const char *name, const char *value); |
10 | |
10 | |
11 | struct cacheitem { |
11 | struct cacheitem { |
12 | char *name; |
12 | char *name; |
13 | struct stat st; |
13 | struct stat st; |
14 | int ttl; |
14 | int ttl; |
15 | int fd; |
15 | int fd; |
16 | }; |
16 | }; |
17 | |
17 | |
18 | struct commitinfo { |
18 | struct commitinfo { |
19 | struct commit *commit; |
19 | struct commit *commit; |
20 | char *author; |
20 | char *author; |
21 | char *committer; |
21 | char *committer; |
22 | char *subject; |
22 | char *subject; |
23 | char *msg; |
23 | char *msg; |
24 | }; |
24 | }; |
25 | |
25 | |
26 | extern const char cgit_version[]; |
26 | extern const char cgit_version[]; |
27 | |
27 | |
28 | extern char *cgit_root; |
28 | extern char *cgit_root; |
29 | extern char *cgit_root_title; |
29 | extern char *cgit_root_title; |
30 | extern char *cgit_css; |
30 | extern char *cgit_css; |
31 | extern char *cgit_logo; |
31 | extern char *cgit_logo; |
32 | extern char *cgit_logo_link; |
32 | extern char *cgit_logo_link; |
33 | extern char *cgit_virtual_root; |
33 | extern char *cgit_virtual_root; |
34 | extern char *cgit_cache_root; |
34 | extern char *cgit_cache_root; |
35 | |
35 | |
| |
36 | extern int cgit_nocache; |
36 | extern int cgit_max_lock_attempts; |
37 | extern int cgit_max_lock_attempts; |
37 | extern int cgit_cache_root_ttl; |
38 | extern int cgit_cache_root_ttl; |
38 | extern int cgit_cache_repo_ttl; |
39 | extern int cgit_cache_repo_ttl; |
39 | extern int cgit_cache_dynamic_ttl; |
40 | extern int cgit_cache_dynamic_ttl; |
40 | extern int cgit_cache_static_ttl; |
41 | extern int cgit_cache_static_ttl; |
41 | extern int cgit_cache_max_create_time; |
42 | extern int cgit_cache_max_create_time; |
42 | |
43 | |
43 | extern char *cgit_repo_name; |
44 | extern char *cgit_repo_name; |
44 | extern char *cgit_repo_desc; |
45 | extern char *cgit_repo_desc; |
45 | extern char *cgit_repo_owner; |
46 | extern char *cgit_repo_owner; |
46 | |
47 | |
47 | extern int cgit_query_has_symref; |
48 | extern int cgit_query_has_symref; |
48 | extern int cgit_query_has_sha1; |
49 | extern int cgit_query_has_sha1; |
49 | |
50 | |
50 | extern char *cgit_querystring; |
51 | extern char *cgit_querystring; |
51 | extern char *cgit_query_repo; |
52 | extern char *cgit_query_repo; |
52 | extern char *cgit_query_page; |
53 | extern char *cgit_query_page; |
53 | extern char *cgit_query_head; |
54 | extern char *cgit_query_head; |
54 | extern char *cgit_query_sha1; |
55 | extern char *cgit_query_sha1; |
55 | extern int cgit_query_ofs; |
56 | extern int cgit_query_ofs; |
56 | |
57 | |
57 | extern int htmlfd; |
58 | extern int htmlfd; |
58 | |
59 | |
59 | extern void cgit_global_config_cb(const char *name, const char *value); |
60 | extern void cgit_global_config_cb(const char *name, const char *value); |
60 | extern void cgit_repo_config_cb(const char *name, const char *value); |
61 | extern void cgit_repo_config_cb(const char *name, const char *value); |
61 | extern void cgit_querystring_cb(const char *name, const char *value); |
62 | extern void cgit_querystring_cb(const char *name, const char *value); |
62 | |
63 | |
63 | extern char *fmt(const char *format,...); |
64 | extern char *fmt(const char *format,...); |
64 | |
65 | |
65 | extern void html(const char *txt); |
66 | extern void html(const char *txt); |
66 | extern void htmlf(const char *format,...); |
67 | extern void htmlf(const char *format,...); |
67 | extern void html_txt(char *txt); |
68 | extern void html_txt(char *txt); |
68 | extern void html_attr(char *txt); |
69 | extern void html_attr(char *txt); |
69 | extern void html_link_open(char *url, char *title, char *class); |
70 | extern void html_link_open(char *url, char *title, char *class); |
70 | extern void html_link_close(void); |
71 | extern void html_link_close(void); |
71 | |
72 | |
72 | extern int cgit_read_config(const char *filename, configfn fn); |
73 | extern int cgit_read_config(const char *filename, configfn fn); |
73 | extern int cgit_parse_query(char *txt, configfn fn); |
74 | extern int cgit_parse_query(char *txt, configfn fn); |
74 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
75 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
75 | |
76 | |
76 | extern void cache_prepare(struct cacheitem *item); |
77 | extern void cache_prepare(struct cacheitem *item); |
77 | extern int cache_lock(struct cacheitem *item); |
78 | extern int cache_lock(struct cacheitem *item); |
78 | extern int cache_unlock(struct cacheitem *item); |
79 | extern int cache_unlock(struct cacheitem *item); |
79 | extern int cache_cancel_lock(struct cacheitem *item); |
80 | extern int cache_cancel_lock(struct cacheitem *item); |
80 | extern int cache_exist(struct cacheitem *item); |
81 | extern int cache_exist(struct cacheitem *item); |
81 | extern int cache_expired(struct cacheitem *item); |
82 | extern int cache_expired(struct cacheitem *item); |
82 | |
83 | |
83 | extern char *cgit_repourl(const char *reponame); |
84 | extern char *cgit_repourl(const char *reponame); |
|
|
diff --git a/shared.c b/shared.c index 5f2a5ce..7149597 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -1,85 +1,88 @@ |
1 | /* shared.c: global vars + some callback functions |
1 | /* shared.c: global vars + some callback functions |
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 | char *cgit_root = "/usr/src/git"; |
11 | char *cgit_root = "/usr/src/git"; |
12 | char *cgit_root_title = "Git repository browser"; |
12 | char *cgit_root_title = "Git repository browser"; |
13 | char *cgit_css = "/cgit.css"; |
13 | char *cgit_css = "/cgit.css"; |
14 | char *cgit_logo = "/git-logo.png"; |
14 | char *cgit_logo = "/git-logo.png"; |
15 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
15 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
16 | char *cgit_virtual_root = NULL; |
16 | char *cgit_virtual_root = NULL; |
17 | |
17 | |
18 | char *cgit_cache_root = "/var/cache/cgit"; |
18 | char *cgit_cache_root = "/var/cache/cgit"; |
19 | |
19 | |
| |
20 | int cgit_nocache = 0; |
20 | int cgit_max_lock_attempts = 5; |
21 | int cgit_max_lock_attempts = 5; |
21 | int cgit_cache_root_ttl = 5; |
22 | int cgit_cache_root_ttl = 5; |
22 | int cgit_cache_repo_ttl = 5; |
23 | int cgit_cache_repo_ttl = 5; |
23 | int cgit_cache_dynamic_ttl = 5; |
24 | int cgit_cache_dynamic_ttl = 5; |
24 | int cgit_cache_static_ttl = -1; |
25 | int cgit_cache_static_ttl = -1; |
25 | int cgit_cache_max_create_time = 5; |
26 | int cgit_cache_max_create_time = 5; |
26 | |
27 | |
27 | char *cgit_repo_name = NULL; |
28 | char *cgit_repo_name = NULL; |
28 | char *cgit_repo_desc = NULL; |
29 | char *cgit_repo_desc = NULL; |
29 | char *cgit_repo_owner = NULL; |
30 | char *cgit_repo_owner = NULL; |
30 | |
31 | |
31 | int cgit_query_has_symref = 0; |
32 | int cgit_query_has_symref = 0; |
32 | int cgit_query_has_sha1 = 0; |
33 | int cgit_query_has_sha1 = 0; |
33 | |
34 | |
34 | char *cgit_querystring = NULL; |
35 | char *cgit_querystring = NULL; |
35 | char *cgit_query_repo = NULL; |
36 | char *cgit_query_repo = NULL; |
36 | char *cgit_query_page = NULL; |
37 | char *cgit_query_page = NULL; |
37 | char *cgit_query_head = NULL; |
38 | char *cgit_query_head = NULL; |
38 | char *cgit_query_sha1 = NULL; |
39 | char *cgit_query_sha1 = NULL; |
39 | int cgit_query_ofs = 0; |
40 | int cgit_query_ofs = 0; |
40 | |
41 | |
41 | int htmlfd = 0; |
42 | int htmlfd = 0; |
42 | |
43 | |
43 | void cgit_global_config_cb(const char *name, const char *value) |
44 | void cgit_global_config_cb(const char *name, const char *value) |
44 | { |
45 | { |
45 | if (!strcmp(name, "root")) |
46 | if (!strcmp(name, "root")) |
46 | cgit_root = xstrdup(value); |
47 | cgit_root = xstrdup(value); |
47 | else if (!strcmp(name, "root-title")) |
48 | else if (!strcmp(name, "root-title")) |
48 | cgit_root_title = xstrdup(value); |
49 | cgit_root_title = xstrdup(value); |
49 | else if (!strcmp(name, "css")) |
50 | else if (!strcmp(name, "css")) |
50 | cgit_css = xstrdup(value); |
51 | cgit_css = xstrdup(value); |
51 | else if (!strcmp(name, "logo")) |
52 | else if (!strcmp(name, "logo")) |
52 | cgit_logo = xstrdup(value); |
53 | cgit_logo = xstrdup(value); |
53 | else if (!strcmp(name, "logo-link")) |
54 | else if (!strcmp(name, "logo-link")) |
54 | cgit_logo_link = xstrdup(value); |
55 | cgit_logo_link = xstrdup(value); |
55 | else if (!strcmp(name, "virtual-root")) |
56 | else if (!strcmp(name, "virtual-root")) |
56 | cgit_virtual_root = xstrdup(value); |
57 | cgit_virtual_root = xstrdup(value); |
| |
58 | else if (!strcmp(name, "nocache")) |
| |
59 | cgit_nocache = atoi(value); |
57 | } |
60 | } |
58 | |
61 | |
59 | void cgit_repo_config_cb(const char *name, const char *value) |
62 | void cgit_repo_config_cb(const char *name, const char *value) |
60 | { |
63 | { |
61 | if (!strcmp(name, "name")) |
64 | if (!strcmp(name, "name")) |
62 | cgit_repo_name = xstrdup(value); |
65 | cgit_repo_name = xstrdup(value); |
63 | else if (!strcmp(name, "desc")) |
66 | else if (!strcmp(name, "desc")) |
64 | cgit_repo_desc = xstrdup(value); |
67 | cgit_repo_desc = xstrdup(value); |
65 | else if (!strcmp(name, "owner")) |
68 | else if (!strcmp(name, "owner")) |
66 | cgit_repo_owner = xstrdup(value); |
69 | cgit_repo_owner = xstrdup(value); |
67 | } |
70 | } |
68 | |
71 | |
69 | void cgit_querystring_cb(const char *name, const char *value) |
72 | void cgit_querystring_cb(const char *name, const char *value) |
70 | { |
73 | { |
71 | if (!strcmp(name,"r")) { |
74 | if (!strcmp(name,"r")) { |
72 | cgit_query_repo = xstrdup(value); |
75 | cgit_query_repo = xstrdup(value); |
73 | } else if (!strcmp(name, "p")) { |
76 | } else if (!strcmp(name, "p")) { |
74 | cgit_query_page = xstrdup(value); |
77 | cgit_query_page = xstrdup(value); |
75 | } else if (!strcmp(name, "h")) { |
78 | } else if (!strcmp(name, "h")) { |
76 | cgit_query_head = xstrdup(value); |
79 | cgit_query_head = xstrdup(value); |
77 | cgit_query_has_symref = 1; |
80 | cgit_query_has_symref = 1; |
78 | } else if (!strcmp(name, "id")) { |
81 | } else if (!strcmp(name, "id")) { |
79 | cgit_query_sha1 = xstrdup(value); |
82 | cgit_query_sha1 = xstrdup(value); |
80 | cgit_query_has_sha1 = 1; |
83 | cgit_query_has_sha1 = 1; |
81 | } else if (!strcmp(name, "ofs")) { |
84 | } else if (!strcmp(name, "ofs")) { |
82 | cgit_query_ofs = atoi(value); |
85 | cgit_query_ofs = atoi(value); |
83 | } |
86 | } |
84 | } |
87 | } |
85 | |
88 | |
|