|
diff --git a/cgit.c b/cgit.c index 37cdb83..9dbc608 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -93,18 +93,62 @@ static void cgit_print_cache(struct cacheitem *item) |
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); |
| |
141 | if (getenv("QUERY_STRING")) |
104 | cgit_querystring = xstrdup(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 | |
| |
146 | if (cgit_nocache) { |
| |
147 | item.fd = STDOUT_FILENO; |
| |
148 | cgit_fill_cache(&item); |
| |
149 | } else { |
107 | cgit_check_cache(&item); |
150 | cgit_check_cache(&item); |
108 | cgit_print_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 |
|
@@ -30,12 +30,13 @@ 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; |
|
|
diff --git a/shared.c b/shared.c index 5f2a5ce..7149597 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -14,12 +14,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; |
@@ -51,12 +52,14 @@ void cgit_global_config_cb(const char *name, const char *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); |
|