author | Lars Hjemli <hjemli@gmail.com> | 2007-05-17 22:47:47 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-18 20:51:01 (UTC) |
commit | 305414df1246531baf0f2c959c2c61df4e93c526 (patch) (unidiff) | |
tree | 18f071e269f01b875fd0045723faab30345d93ae | |
parent | 08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff) | |
download | cgit-305414df1246531baf0f2c959c2c61df4e93c526.zip cgit-305414df1246531baf0f2c959c2c61df4e93c526.tar.gz cgit-305414df1246531baf0f2c959c2c61df4e93c526.tar.bz2 |
Move cgit_get_repoinfo into shared.c
This function will be usefull when parsing url arguments.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 14 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 13 |
3 files changed, 14 insertions, 14 deletions
@@ -1,266 +1,252 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
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 | const char cgit_version[] = CGIT_VERSION; | 11 | const char cgit_version[] = CGIT_VERSION; |
12 | 12 | ||
13 | 13 | ||
14 | static struct repoinfo *cgit_get_repoinfo(char *url) | ||
15 | { | ||
16 | int i; | ||
17 | struct repoinfo *repo; | ||
18 | |||
19 | for (i=0; i<cgit_repolist.count; i++) { | ||
20 | repo = &cgit_repolist.repos[i]; | ||
21 | if (!strcmp(repo->url, url)) | ||
22 | return repo; | ||
23 | } | ||
24 | return NULL; | ||
25 | } | ||
26 | |||
27 | |||
28 | static int cgit_prepare_cache(struct cacheitem *item) | 14 | static int cgit_prepare_cache(struct cacheitem *item) |
29 | { | 15 | { |
30 | if (!cgit_query_repo) { | 16 | if (!cgit_query_repo) { |
31 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 17 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
32 | item->ttl = cgit_cache_root_ttl; | 18 | item->ttl = cgit_cache_root_ttl; |
33 | return 1; | 19 | return 1; |
34 | } | 20 | } |
35 | cgit_repo = cgit_get_repoinfo(cgit_query_repo); | 21 | cgit_repo = cgit_get_repoinfo(cgit_query_repo); |
36 | if (!cgit_repo) { | 22 | if (!cgit_repo) { |
37 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 23 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
38 | cgit_print_docstart(title, item); | 24 | cgit_print_docstart(title, item); |
39 | cgit_print_pageheader(title, 0); | 25 | cgit_print_pageheader(title, 0); |
40 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); | 26 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); |
41 | cgit_print_docend(); | 27 | cgit_print_docend(); |
42 | return 0; | 28 | return 0; |
43 | } | 29 | } |
44 | 30 | ||
45 | if (!cgit_query_page) { | 31 | if (!cgit_query_page) { |
46 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, | 32 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
47 | cgit_repo->url)); | 33 | cgit_repo->url)); |
48 | item->ttl = cgit_cache_repo_ttl; | 34 | item->ttl = cgit_cache_repo_ttl; |
49 | } else { | 35 | } else { |
50 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 36 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
51 | cgit_repo->url, cgit_query_page, | 37 | cgit_repo->url, cgit_query_page, |
52 | cache_safe_filename(cgit_querystring))); | 38 | cache_safe_filename(cgit_querystring))); |
53 | if (cgit_query_has_symref) | 39 | if (cgit_query_has_symref) |
54 | item->ttl = cgit_cache_dynamic_ttl; | 40 | item->ttl = cgit_cache_dynamic_ttl; |
55 | else if (cgit_query_has_sha1) | 41 | else if (cgit_query_has_sha1) |
56 | item->ttl = cgit_cache_static_ttl; | 42 | item->ttl = cgit_cache_static_ttl; |
57 | else | 43 | else |
58 | item->ttl = cgit_cache_repo_ttl; | 44 | item->ttl = cgit_cache_repo_ttl; |
59 | } | 45 | } |
60 | return 1; | 46 | return 1; |
61 | } | 47 | } |
62 | 48 | ||
63 | static void cgit_print_repo_page(struct cacheitem *item) | 49 | static void cgit_print_repo_page(struct cacheitem *item) |
64 | { | 50 | { |
65 | char *title; | 51 | char *title; |
66 | int show_search; | 52 | int show_search; |
67 | 53 | ||
68 | if (!cgit_query_head) | 54 | if (!cgit_query_head) |
69 | cgit_query_head = cgit_repo->defbranch; | 55 | cgit_query_head = cgit_repo->defbranch; |
70 | 56 | ||
71 | if (chdir(cgit_repo->path)) { | 57 | if (chdir(cgit_repo->path)) { |
72 | title = fmt("%s - %s", cgit_root_title, "Bad request"); | 58 | title = fmt("%s - %s", cgit_root_title, "Bad request"); |
73 | cgit_print_docstart(title, item); | 59 | cgit_print_docstart(title, item); |
74 | cgit_print_pageheader(title, 0); | 60 | cgit_print_pageheader(title, 0); |
75 | cgit_print_error(fmt("Unable to scan repository: %s", | 61 | cgit_print_error(fmt("Unable to scan repository: %s", |
76 | strerror(errno))); | 62 | strerror(errno))); |
77 | cgit_print_docend(); | 63 | cgit_print_docend(); |
78 | return; | 64 | return; |
79 | } | 65 | } |
80 | 66 | ||
81 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); | 67 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
82 | show_search = 0; | 68 | show_search = 0; |
83 | setenv("GIT_DIR", cgit_repo->path, 1); | 69 | setenv("GIT_DIR", cgit_repo->path, 1); |
84 | 70 | ||
85 | if (cgit_query_page) { | 71 | if (cgit_query_page) { |
86 | if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { | 72 | if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { |
87 | cgit_print_snapshot(item, cgit_query_sha1, "zip", | 73 | cgit_print_snapshot(item, cgit_query_sha1, "zip", |
88 | cgit_repo->url, cgit_query_name); | 74 | cgit_repo->url, cgit_query_name); |
89 | return; | 75 | return; |
90 | } | 76 | } |
91 | if (!strcmp(cgit_query_page, "blob")) { | 77 | if (!strcmp(cgit_query_page, "blob")) { |
92 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); | 78 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
93 | return; | 79 | return; |
94 | } | 80 | } |
95 | } | 81 | } |
96 | 82 | ||
97 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) | 83 | if (cgit_query_page && !strcmp(cgit_query_page, "log")) |
98 | show_search = 1; | 84 | show_search = 1; |
99 | 85 | ||
100 | cgit_print_docstart(title, item); | 86 | cgit_print_docstart(title, item); |
101 | 87 | ||
102 | 88 | ||
103 | if (!cgit_query_page) { | 89 | if (!cgit_query_page) { |
104 | cgit_print_pageheader("summary", show_search); | 90 | cgit_print_pageheader("summary", show_search); |
105 | cgit_print_summary(); | 91 | cgit_print_summary(); |
106 | cgit_print_docend(); | 92 | cgit_print_docend(); |
107 | return; | 93 | return; |
108 | } | 94 | } |
109 | 95 | ||
110 | cgit_print_pageheader(cgit_query_page, show_search); | 96 | cgit_print_pageheader(cgit_query_page, show_search); |
111 | 97 | ||
112 | if (!strcmp(cgit_query_page, "log")) { | 98 | if (!strcmp(cgit_query_page, "log")) { |
113 | cgit_print_log(cgit_query_head, cgit_query_ofs, | 99 | cgit_print_log(cgit_query_head, cgit_query_ofs, |
114 | cgit_max_commit_count, cgit_query_search, | 100 | cgit_max_commit_count, cgit_query_search, |
115 | cgit_query_path); | 101 | cgit_query_path); |
116 | } else if (!strcmp(cgit_query_page, "tree")) { | 102 | } else if (!strcmp(cgit_query_page, "tree")) { |
117 | cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); | 103 | cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path); |
118 | } else if (!strcmp(cgit_query_page, "commit")) { | 104 | } else if (!strcmp(cgit_query_page, "commit")) { |
119 | cgit_print_commit(cgit_query_head); | 105 | cgit_print_commit(cgit_query_head); |
120 | } else if (!strcmp(cgit_query_page, "view")) { | 106 | } else if (!strcmp(cgit_query_page, "view")) { |
121 | cgit_print_view(cgit_query_sha1, cgit_query_path); | 107 | cgit_print_view(cgit_query_sha1, cgit_query_path); |
122 | } else if (!strcmp(cgit_query_page, "diff")) { | 108 | } else if (!strcmp(cgit_query_page, "diff")) { |
123 | cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, | 109 | cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, |
124 | cgit_query_path); | 110 | cgit_query_path); |
125 | } else { | 111 | } else { |
126 | cgit_print_error("Invalid request"); | 112 | cgit_print_error("Invalid request"); |
127 | } | 113 | } |
128 | cgit_print_docend(); | 114 | cgit_print_docend(); |
129 | } | 115 | } |
130 | 116 | ||
131 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 117 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
132 | { | 118 | { |
133 | static char buf[PATH_MAX]; | 119 | static char buf[PATH_MAX]; |
134 | int stdout2; | 120 | int stdout2; |
135 | 121 | ||
136 | getcwd(buf, sizeof(buf)); | 122 | getcwd(buf, sizeof(buf)); |
137 | item->st.st_mtime = time(NULL); | 123 | item->st.st_mtime = time(NULL); |
138 | 124 | ||
139 | if (use_cache) { | 125 | if (use_cache) { |
140 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 126 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
141 | "Preserving STDOUT"); | 127 | "Preserving STDOUT"); |
142 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 128 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
143 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 129 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
144 | } | 130 | } |
145 | 131 | ||
146 | if (cgit_query_repo) | 132 | if (cgit_query_repo) |
147 | cgit_print_repo_page(item); | 133 | cgit_print_repo_page(item); |
148 | else | 134 | else |
149 | cgit_print_repolist(item); | 135 | cgit_print_repolist(item); |
150 | 136 | ||
151 | if (use_cache) { | 137 | if (use_cache) { |
152 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); | 138 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
153 | chk_positive(dup2(stdout2, STDOUT_FILENO), | 139 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
154 | "Restoring original STDOUT"); | 140 | "Restoring original STDOUT"); |
155 | chk_zero(close(stdout2), "Closing temporary STDOUT"); | 141 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
156 | } | 142 | } |
157 | 143 | ||
158 | chdir(buf); | 144 | chdir(buf); |
159 | } | 145 | } |
160 | 146 | ||
161 | static void cgit_check_cache(struct cacheitem *item) | 147 | static void cgit_check_cache(struct cacheitem *item) |
162 | { | 148 | { |
163 | int i = 0; | 149 | int i = 0; |
164 | 150 | ||
165 | top: | 151 | top: |
166 | if (++i > cgit_max_lock_attempts) { | 152 | if (++i > cgit_max_lock_attempts) { |
167 | die("cgit_refresh_cache: unable to lock %s: %s", | 153 | die("cgit_refresh_cache: unable to lock %s: %s", |
168 | item->name, strerror(errno)); | 154 | item->name, strerror(errno)); |
169 | } | 155 | } |
170 | if (!cache_exist(item)) { | 156 | if (!cache_exist(item)) { |
171 | if (!cache_lock(item)) { | 157 | if (!cache_lock(item)) { |
172 | sleep(1); | 158 | sleep(1); |
173 | goto top; | 159 | goto top; |
174 | } | 160 | } |
175 | if (!cache_exist(item)) { | 161 | if (!cache_exist(item)) { |
176 | cgit_fill_cache(item, 1); | 162 | cgit_fill_cache(item, 1); |
177 | cache_unlock(item); | 163 | cache_unlock(item); |
178 | } else { | 164 | } else { |
179 | cache_cancel_lock(item); | 165 | cache_cancel_lock(item); |
180 | } | 166 | } |
181 | } else if (cache_expired(item) && cache_lock(item)) { | 167 | } else if (cache_expired(item) && cache_lock(item)) { |
182 | if (cache_expired(item)) { | 168 | if (cache_expired(item)) { |
183 | cgit_fill_cache(item, 1); | 169 | cgit_fill_cache(item, 1); |
184 | cache_unlock(item); | 170 | cache_unlock(item); |
185 | } else { | 171 | } else { |
186 | cache_cancel_lock(item); | 172 | cache_cancel_lock(item); |
187 | } | 173 | } |
188 | } | 174 | } |
189 | } | 175 | } |
190 | 176 | ||
191 | static void cgit_print_cache(struct cacheitem *item) | 177 | static void cgit_print_cache(struct cacheitem *item) |
192 | { | 178 | { |
193 | static char buf[4096]; | 179 | static char buf[4096]; |
194 | ssize_t i; | 180 | ssize_t i; |
195 | 181 | ||
196 | int fd = open(item->name, O_RDONLY); | 182 | int fd = open(item->name, O_RDONLY); |
197 | if (fd<0) | 183 | if (fd<0) |
198 | die("Unable to open cached file %s", item->name); | 184 | die("Unable to open cached file %s", item->name); |
199 | 185 | ||
200 | while((i=read(fd, buf, sizeof(buf))) > 0) | 186 | while((i=read(fd, buf, sizeof(buf))) > 0) |
201 | write(STDOUT_FILENO, buf, i); | 187 | write(STDOUT_FILENO, buf, i); |
202 | 188 | ||
203 | close(fd); | 189 | close(fd); |
204 | } | 190 | } |
205 | 191 | ||
206 | static void cgit_parse_args(int argc, const char **argv) | 192 | static void cgit_parse_args(int argc, const char **argv) |
207 | { | 193 | { |
208 | int i; | 194 | int i; |
209 | 195 | ||
210 | for (i = 1; i < argc; i++) { | 196 | for (i = 1; i < argc; i++) { |
211 | if (!strncmp(argv[i], "--cache=", 8)) { | 197 | if (!strncmp(argv[i], "--cache=", 8)) { |
212 | cgit_cache_root = xstrdup(argv[i]+8); | 198 | cgit_cache_root = xstrdup(argv[i]+8); |
213 | } | 199 | } |
214 | if (!strcmp(argv[i], "--nocache")) { | 200 | if (!strcmp(argv[i], "--nocache")) { |
215 | cgit_nocache = 1; | 201 | cgit_nocache = 1; |
216 | } | 202 | } |
217 | if (!strncmp(argv[i], "--query=", 8)) { | 203 | if (!strncmp(argv[i], "--query=", 8)) { |
218 | cgit_querystring = xstrdup(argv[i]+8); | 204 | cgit_querystring = xstrdup(argv[i]+8); |
219 | } | 205 | } |
220 | if (!strncmp(argv[i], "--repo=", 7)) { | 206 | if (!strncmp(argv[i], "--repo=", 7)) { |
221 | cgit_query_repo = xstrdup(argv[i]+7); | 207 | cgit_query_repo = xstrdup(argv[i]+7); |
222 | } | 208 | } |
223 | if (!strncmp(argv[i], "--page=", 7)) { | 209 | if (!strncmp(argv[i], "--page=", 7)) { |
224 | cgit_query_page = xstrdup(argv[i]+7); | 210 | cgit_query_page = xstrdup(argv[i]+7); |
225 | } | 211 | } |
226 | if (!strncmp(argv[i], "--head=", 7)) { | 212 | if (!strncmp(argv[i], "--head=", 7)) { |
227 | cgit_query_head = xstrdup(argv[i]+7); | 213 | cgit_query_head = xstrdup(argv[i]+7); |
228 | cgit_query_has_symref = 1; | 214 | cgit_query_has_symref = 1; |
229 | } | 215 | } |
230 | if (!strncmp(argv[i], "--sha1=", 7)) { | 216 | if (!strncmp(argv[i], "--sha1=", 7)) { |
231 | cgit_query_sha1 = xstrdup(argv[i]+7); | 217 | cgit_query_sha1 = xstrdup(argv[i]+7); |
232 | cgit_query_has_sha1 = 1; | 218 | cgit_query_has_sha1 = 1; |
233 | } | 219 | } |
234 | if (!strncmp(argv[i], "--ofs=", 6)) { | 220 | if (!strncmp(argv[i], "--ofs=", 6)) { |
235 | cgit_query_ofs = atoi(argv[i]+6); | 221 | cgit_query_ofs = atoi(argv[i]+6); |
236 | } | 222 | } |
237 | } | 223 | } |
238 | } | 224 | } |
239 | 225 | ||
240 | int main(int argc, const char **argv) | 226 | int main(int argc, const char **argv) |
241 | { | 227 | { |
242 | struct cacheitem item; | 228 | struct cacheitem item; |
243 | 229 | ||
244 | htmlfd = STDOUT_FILENO; | 230 | htmlfd = STDOUT_FILENO; |
245 | item.st.st_mtime = time(NULL); | 231 | item.st.st_mtime = time(NULL); |
246 | cgit_repolist.length = 0; | 232 | cgit_repolist.length = 0; |
247 | cgit_repolist.count = 0; | 233 | cgit_repolist.count = 0; |
248 | cgit_repolist.repos = NULL; | 234 | cgit_repolist.repos = NULL; |
249 | 235 | ||
250 | cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); | 236 | cgit_read_config(CGIT_CONFIG, cgit_global_config_cb); |
251 | if (getenv("SCRIPT_NAME")) | 237 | if (getenv("SCRIPT_NAME")) |
252 | cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); | 238 | cgit_script_name = xstrdup(getenv("SCRIPT_NAME")); |
253 | if (getenv("QUERY_STRING")) | 239 | if (getenv("QUERY_STRING")) |
254 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); | 240 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
255 | cgit_parse_args(argc, argv); | 241 | cgit_parse_args(argc, argv); |
256 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); | 242 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); |
257 | if (!cgit_prepare_cache(&item)) | 243 | if (!cgit_prepare_cache(&item)) |
258 | return 0; | 244 | return 0; |
259 | if (cgit_nocache) { | 245 | if (cgit_nocache) { |
260 | cgit_fill_cache(&item, 0); | 246 | cgit_fill_cache(&item, 0); |
261 | } else { | 247 | } else { |
262 | cgit_check_cache(&item); | 248 | cgit_check_cache(&item); |
263 | cgit_print_cache(&item); | 249 | cgit_print_cache(&item); |
264 | } | 250 | } |
265 | return 0; | 251 | return 0; |
266 | } | 252 | } |
@@ -1,186 +1,187 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | 19 | ||
20 | 20 | ||
21 | typedef void (*configfn)(const char *name, const char *value); | 21 | typedef void (*configfn)(const char *name, const char *value); |
22 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 22 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
23 | typedef void (*linediff_fn)(char *line, int len); | 23 | typedef void (*linediff_fn)(char *line, int len); |
24 | 24 | ||
25 | struct cacheitem { | 25 | struct cacheitem { |
26 | char *name; | 26 | char *name; |
27 | struct stat st; | 27 | struct stat st; |
28 | int ttl; | 28 | int ttl; |
29 | int fd; | 29 | int fd; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | struct repoinfo { | 32 | struct repoinfo { |
33 | char *url; | 33 | char *url; |
34 | char *name; | 34 | char *name; |
35 | char *path; | 35 | char *path; |
36 | char *desc; | 36 | char *desc; |
37 | char *owner; | 37 | char *owner; |
38 | char *defbranch; | 38 | char *defbranch; |
39 | char *module_link; | 39 | char *module_link; |
40 | int snapshots; | 40 | int snapshots; |
41 | int enable_log_filecount; | 41 | int enable_log_filecount; |
42 | int enable_log_linecount; | 42 | int enable_log_linecount; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | struct repolist { | 45 | struct repolist { |
46 | int length; | 46 | int length; |
47 | int count; | 47 | int count; |
48 | struct repoinfo *repos; | 48 | struct repoinfo *repos; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | struct commitinfo { | 51 | struct commitinfo { |
52 | struct commit *commit; | 52 | struct commit *commit; |
53 | char *author; | 53 | char *author; |
54 | char *author_email; | 54 | char *author_email; |
55 | unsigned long author_date; | 55 | unsigned long author_date; |
56 | char *committer; | 56 | char *committer; |
57 | char *committer_email; | 57 | char *committer_email; |
58 | unsigned long committer_date; | 58 | unsigned long committer_date; |
59 | char *subject; | 59 | char *subject; |
60 | char *msg; | 60 | char *msg; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | struct taginfo { | 63 | struct taginfo { |
64 | char *tagger; | 64 | char *tagger; |
65 | char *tagger_email; | 65 | char *tagger_email; |
66 | int tagger_date; | 66 | int tagger_date; |
67 | char *msg; | 67 | char *msg; |
68 | }; | 68 | }; |
69 | 69 | ||
70 | extern const char cgit_version[]; | 70 | extern const char cgit_version[]; |
71 | 71 | ||
72 | extern struct repolist cgit_repolist; | 72 | extern struct repolist cgit_repolist; |
73 | extern struct repoinfo *cgit_repo; | 73 | extern struct repoinfo *cgit_repo; |
74 | 74 | ||
75 | extern char *cgit_root_title; | 75 | extern char *cgit_root_title; |
76 | extern char *cgit_css; | 76 | extern char *cgit_css; |
77 | extern char *cgit_logo; | 77 | extern char *cgit_logo; |
78 | extern char *cgit_logo_link; | 78 | extern char *cgit_logo_link; |
79 | extern char *cgit_module_link; | 79 | extern char *cgit_module_link; |
80 | extern char *cgit_virtual_root; | 80 | extern char *cgit_virtual_root; |
81 | extern char *cgit_script_name; | 81 | extern char *cgit_script_name; |
82 | extern char *cgit_cache_root; | 82 | extern char *cgit_cache_root; |
83 | 83 | ||
84 | extern int cgit_nocache; | 84 | extern int cgit_nocache; |
85 | extern int cgit_snapshots; | 85 | extern int cgit_snapshots; |
86 | extern int cgit_enable_log_filecount; | 86 | extern int cgit_enable_log_filecount; |
87 | extern int cgit_enable_log_linecount; | 87 | extern int cgit_enable_log_linecount; |
88 | extern int cgit_max_lock_attempts; | 88 | extern int cgit_max_lock_attempts; |
89 | extern int cgit_cache_root_ttl; | 89 | extern int cgit_cache_root_ttl; |
90 | extern int cgit_cache_repo_ttl; | 90 | extern int cgit_cache_repo_ttl; |
91 | extern int cgit_cache_dynamic_ttl; | 91 | extern int cgit_cache_dynamic_ttl; |
92 | extern int cgit_cache_static_ttl; | 92 | extern int cgit_cache_static_ttl; |
93 | extern int cgit_cache_max_create_time; | 93 | extern int cgit_cache_max_create_time; |
94 | 94 | ||
95 | extern int cgit_max_msg_len; | 95 | extern int cgit_max_msg_len; |
96 | extern int cgit_max_repodesc_len; | 96 | extern int cgit_max_repodesc_len; |
97 | extern int cgit_max_commit_count; | 97 | extern int cgit_max_commit_count; |
98 | 98 | ||
99 | extern int cgit_query_has_symref; | 99 | extern int cgit_query_has_symref; |
100 | extern int cgit_query_has_sha1; | 100 | extern int cgit_query_has_sha1; |
101 | 101 | ||
102 | extern char *cgit_querystring; | 102 | extern char *cgit_querystring; |
103 | extern char *cgit_query_repo; | 103 | extern char *cgit_query_repo; |
104 | extern char *cgit_query_page; | 104 | extern char *cgit_query_page; |
105 | extern char *cgit_query_search; | 105 | extern char *cgit_query_search; |
106 | extern char *cgit_query_head; | 106 | extern char *cgit_query_head; |
107 | extern char *cgit_query_sha1; | 107 | extern char *cgit_query_sha1; |
108 | extern char *cgit_query_sha2; | 108 | extern char *cgit_query_sha2; |
109 | extern char *cgit_query_path; | 109 | extern char *cgit_query_path; |
110 | extern char *cgit_query_name; | 110 | extern char *cgit_query_name; |
111 | extern int cgit_query_ofs; | 111 | extern int cgit_query_ofs; |
112 | 112 | ||
113 | extern int htmlfd; | 113 | extern int htmlfd; |
114 | 114 | ||
115 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | ||
115 | extern void cgit_global_config_cb(const char *name, const char *value); | 116 | extern void cgit_global_config_cb(const char *name, const char *value); |
116 | extern void cgit_repo_config_cb(const char *name, const char *value); | 117 | extern void cgit_repo_config_cb(const char *name, const char *value); |
117 | extern void cgit_querystring_cb(const char *name, const char *value); | 118 | extern void cgit_querystring_cb(const char *name, const char *value); |
118 | 119 | ||
119 | extern int chk_zero(int result, char *msg); | 120 | extern int chk_zero(int result, char *msg); |
120 | extern int chk_positive(int result, char *msg); | 121 | extern int chk_positive(int result, char *msg); |
121 | 122 | ||
122 | extern int hextoint(char c); | 123 | extern int hextoint(char c); |
123 | 124 | ||
124 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 125 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
125 | 126 | ||
126 | extern int cgit_diff_files(const unsigned char *old_sha1, | 127 | extern int cgit_diff_files(const unsigned char *old_sha1, |
127 | const unsigned char *new_sha1, | 128 | const unsigned char *new_sha1, |
128 | linediff_fn fn); | 129 | linediff_fn fn); |
129 | 130 | ||
130 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 131 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
131 | const unsigned char *new_sha1, | 132 | const unsigned char *new_sha1, |
132 | filepair_fn fn); | 133 | filepair_fn fn); |
133 | 134 | ||
134 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 135 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
135 | 136 | ||
136 | extern char *fmt(const char *format,...); | 137 | extern char *fmt(const char *format,...); |
137 | 138 | ||
138 | extern void html(const char *txt); | 139 | extern void html(const char *txt); |
139 | extern void htmlf(const char *format,...); | 140 | extern void htmlf(const char *format,...); |
140 | extern void html_txt(char *txt); | 141 | extern void html_txt(char *txt); |
141 | extern void html_ntxt(int len, char *txt); | 142 | extern void html_ntxt(int len, char *txt); |
142 | extern void html_attr(char *txt); | 143 | extern void html_attr(char *txt); |
143 | extern void html_hidden(char *name, char *value); | 144 | extern void html_hidden(char *name, char *value); |
144 | extern void html_link_open(char *url, char *title, char *class); | 145 | extern void html_link_open(char *url, char *title, char *class); |
145 | extern void html_link_close(void); | 146 | extern void html_link_close(void); |
146 | extern void html_filemode(unsigned short mode); | 147 | extern void html_filemode(unsigned short mode); |
147 | 148 | ||
148 | extern int cgit_read_config(const char *filename, configfn fn); | 149 | extern int cgit_read_config(const char *filename, configfn fn); |
149 | extern int cgit_parse_query(char *txt, configfn fn); | 150 | extern int cgit_parse_query(char *txt, configfn fn); |
150 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 151 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
151 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 152 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
152 | 153 | ||
153 | extern char *cache_safe_filename(const char *unsafe); | 154 | extern char *cache_safe_filename(const char *unsafe); |
154 | extern int cache_lock(struct cacheitem *item); | 155 | extern int cache_lock(struct cacheitem *item); |
155 | extern int cache_unlock(struct cacheitem *item); | 156 | extern int cache_unlock(struct cacheitem *item); |
156 | extern int cache_cancel_lock(struct cacheitem *item); | 157 | extern int cache_cancel_lock(struct cacheitem *item); |
157 | extern int cache_exist(struct cacheitem *item); | 158 | extern int cache_exist(struct cacheitem *item); |
158 | extern int cache_expired(struct cacheitem *item); | 159 | extern int cache_expired(struct cacheitem *item); |
159 | 160 | ||
160 | extern char *cgit_repourl(const char *reponame); | 161 | extern char *cgit_repourl(const char *reponame); |
161 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 162 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
162 | const char *query); | 163 | const char *query); |
163 | 164 | ||
164 | extern void cgit_print_error(char *msg); | 165 | extern void cgit_print_error(char *msg); |
165 | extern void cgit_print_date(unsigned long secs); | 166 | extern void cgit_print_date(unsigned long secs); |
166 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 167 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
167 | extern void cgit_print_docend(); | 168 | extern void cgit_print_docend(); |
168 | extern void cgit_print_pageheader(char *title, int show_search); | 169 | extern void cgit_print_pageheader(char *title, int show_search); |
169 | extern void cgit_print_snapshot_start(const char *mimetype, | 170 | extern void cgit_print_snapshot_start(const char *mimetype, |
170 | const char *filename, | 171 | const char *filename, |
171 | struct cacheitem *item); | 172 | struct cacheitem *item); |
172 | 173 | ||
173 | extern void cgit_print_repolist(struct cacheitem *item); | 174 | extern void cgit_print_repolist(struct cacheitem *item); |
174 | extern void cgit_print_summary(); | 175 | extern void cgit_print_summary(); |
175 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path); | 176 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path); |
176 | extern void cgit_print_view(const char *hex, char *path); | 177 | extern void cgit_print_view(const char *hex, char *path); |
177 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 178 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
178 | extern void cgit_print_tree(const char *rev, const char *hex, char *path); | 179 | extern void cgit_print_tree(const char *rev, const char *hex, char *path); |
179 | extern void cgit_print_commit(const char *hex); | 180 | extern void cgit_print_commit(const char *hex); |
180 | extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, | 181 | extern void cgit_print_diff(const char *head, const char *old_hex, const char *new_hex, |
181 | char *path); | 182 | char *path); |
182 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 183 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
183 | const char *format, const char *prefix, | 184 | const char *format, const char *prefix, |
184 | const char *filename); | 185 | const char *filename); |
185 | 186 | ||
186 | #endif /* CGIT_H */ | 187 | #endif /* CGIT_H */ |
@@ -1,328 +1,341 @@ | |||
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 | struct repolist cgit_repolist; | 11 | struct repolist cgit_repolist; |
12 | struct repoinfo *cgit_repo; | 12 | struct repoinfo *cgit_repo; |
13 | 13 | ||
14 | char *cgit_root_title = "Git repository browser"; | 14 | char *cgit_root_title = "Git repository browser"; |
15 | char *cgit_css = "/cgit.css"; | 15 | char *cgit_css = "/cgit.css"; |
16 | char *cgit_logo = "/git-logo.png"; | 16 | char *cgit_logo = "/git-logo.png"; |
17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 17 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; | 18 | char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; |
19 | char *cgit_virtual_root = NULL; | 19 | char *cgit_virtual_root = NULL; |
20 | char *cgit_script_name = CGIT_SCRIPT_NAME; | 20 | char *cgit_script_name = CGIT_SCRIPT_NAME; |
21 | char *cgit_cache_root = "/var/cache/cgit"; | 21 | char *cgit_cache_root = "/var/cache/cgit"; |
22 | 22 | ||
23 | int cgit_nocache = 0; | 23 | int cgit_nocache = 0; |
24 | int cgit_snapshots = 0; | 24 | int cgit_snapshots = 0; |
25 | int cgit_enable_log_filecount = 0; | 25 | int cgit_enable_log_filecount = 0; |
26 | int cgit_enable_log_linecount = 0; | 26 | int cgit_enable_log_linecount = 0; |
27 | int cgit_max_lock_attempts = 5; | 27 | int cgit_max_lock_attempts = 5; |
28 | int cgit_cache_root_ttl = 5; | 28 | int cgit_cache_root_ttl = 5; |
29 | int cgit_cache_repo_ttl = 5; | 29 | int cgit_cache_repo_ttl = 5; |
30 | int cgit_cache_dynamic_ttl = 5; | 30 | int cgit_cache_dynamic_ttl = 5; |
31 | int cgit_cache_static_ttl = -1; | 31 | int cgit_cache_static_ttl = -1; |
32 | int cgit_cache_max_create_time = 5; | 32 | int cgit_cache_max_create_time = 5; |
33 | 33 | ||
34 | int cgit_max_msg_len = 60; | 34 | int cgit_max_msg_len = 60; |
35 | int cgit_max_repodesc_len = 60; | 35 | int cgit_max_repodesc_len = 60; |
36 | int cgit_max_commit_count = 50; | 36 | int cgit_max_commit_count = 50; |
37 | 37 | ||
38 | int cgit_query_has_symref = 0; | 38 | int cgit_query_has_symref = 0; |
39 | int cgit_query_has_sha1 = 0; | 39 | int cgit_query_has_sha1 = 0; |
40 | 40 | ||
41 | char *cgit_querystring = NULL; | 41 | char *cgit_querystring = NULL; |
42 | char *cgit_query_repo = NULL; | 42 | char *cgit_query_repo = NULL; |
43 | char *cgit_query_page = NULL; | 43 | char *cgit_query_page = NULL; |
44 | char *cgit_query_head = NULL; | 44 | char *cgit_query_head = NULL; |
45 | char *cgit_query_search = NULL; | 45 | char *cgit_query_search = NULL; |
46 | char *cgit_query_sha1 = NULL; | 46 | char *cgit_query_sha1 = NULL; |
47 | char *cgit_query_sha2 = NULL; | 47 | char *cgit_query_sha2 = NULL; |
48 | char *cgit_query_path = NULL; | 48 | char *cgit_query_path = NULL; |
49 | char *cgit_query_name = NULL; | 49 | char *cgit_query_name = NULL; |
50 | int cgit_query_ofs = 0; | 50 | int cgit_query_ofs = 0; |
51 | 51 | ||
52 | int htmlfd = 0; | 52 | int htmlfd = 0; |
53 | 53 | ||
54 | int chk_zero(int result, char *msg) | 54 | int chk_zero(int result, char *msg) |
55 | { | 55 | { |
56 | if (result != 0) | 56 | if (result != 0) |
57 | die("%s: %s", msg, strerror(errno)); | 57 | die("%s: %s", msg, strerror(errno)); |
58 | return result; | 58 | return result; |
59 | } | 59 | } |
60 | 60 | ||
61 | int chk_positive(int result, char *msg) | 61 | int chk_positive(int result, char *msg) |
62 | { | 62 | { |
63 | if (result <= 0) | 63 | if (result <= 0) |
64 | die("%s: %s", msg, strerror(errno)); | 64 | die("%s: %s", msg, strerror(errno)); |
65 | return result; | 65 | return result; |
66 | } | 66 | } |
67 | 67 | ||
68 | struct repoinfo *add_repo(const char *url) | 68 | struct repoinfo *add_repo(const char *url) |
69 | { | 69 | { |
70 | struct repoinfo *ret; | 70 | struct repoinfo *ret; |
71 | 71 | ||
72 | if (++cgit_repolist.count > cgit_repolist.length) { | 72 | if (++cgit_repolist.count > cgit_repolist.length) { |
73 | if (cgit_repolist.length == 0) | 73 | if (cgit_repolist.length == 0) |
74 | cgit_repolist.length = 8; | 74 | cgit_repolist.length = 8; |
75 | else | 75 | else |
76 | cgit_repolist.length *= 2; | 76 | cgit_repolist.length *= 2; |
77 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, | 77 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
78 | cgit_repolist.length * | 78 | cgit_repolist.length * |
79 | sizeof(struct repoinfo)); | 79 | sizeof(struct repoinfo)); |
80 | } | 80 | } |
81 | 81 | ||
82 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; | 82 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
83 | ret->url = xstrdup(url); | 83 | ret->url = xstrdup(url); |
84 | ret->name = ret->url; | 84 | ret->name = ret->url; |
85 | ret->path = NULL; | 85 | ret->path = NULL; |
86 | ret->desc = NULL; | 86 | ret->desc = NULL; |
87 | ret->owner = NULL; | 87 | ret->owner = NULL; |
88 | ret->defbranch = "master"; | 88 | ret->defbranch = "master"; |
89 | ret->snapshots = cgit_snapshots; | 89 | ret->snapshots = cgit_snapshots; |
90 | ret->enable_log_filecount = cgit_enable_log_filecount; | 90 | ret->enable_log_filecount = cgit_enable_log_filecount; |
91 | ret->enable_log_linecount = cgit_enable_log_linecount; | 91 | ret->enable_log_linecount = cgit_enable_log_linecount; |
92 | ret->module_link = cgit_module_link; | 92 | ret->module_link = cgit_module_link; |
93 | return ret; | 93 | return ret; |
94 | } | 94 | } |
95 | 95 | ||
96 | struct repoinfo *cgit_get_repoinfo(const char *url) | ||
97 | { | ||
98 | int i; | ||
99 | struct repoinfo *repo; | ||
100 | |||
101 | for (i=0; i<cgit_repolist.count; i++) { | ||
102 | repo = &cgit_repolist.repos[i]; | ||
103 | if (!strcmp(repo->url, url)) | ||
104 | return repo; | ||
105 | } | ||
106 | return NULL; | ||
107 | } | ||
108 | |||
96 | void cgit_global_config_cb(const char *name, const char *value) | 109 | void cgit_global_config_cb(const char *name, const char *value) |
97 | { | 110 | { |
98 | if (!strcmp(name, "root-title")) | 111 | if (!strcmp(name, "root-title")) |
99 | cgit_root_title = xstrdup(value); | 112 | cgit_root_title = xstrdup(value); |
100 | else if (!strcmp(name, "css")) | 113 | else if (!strcmp(name, "css")) |
101 | cgit_css = xstrdup(value); | 114 | cgit_css = xstrdup(value); |
102 | else if (!strcmp(name, "logo")) | 115 | else if (!strcmp(name, "logo")) |
103 | cgit_logo = xstrdup(value); | 116 | cgit_logo = xstrdup(value); |
104 | else if (!strcmp(name, "logo-link")) | 117 | else if (!strcmp(name, "logo-link")) |
105 | cgit_logo_link = xstrdup(value); | 118 | cgit_logo_link = xstrdup(value); |
106 | else if (!strcmp(name, "module-link")) | 119 | else if (!strcmp(name, "module-link")) |
107 | cgit_module_link = xstrdup(value); | 120 | cgit_module_link = xstrdup(value); |
108 | else if (!strcmp(name, "virtual-root")) | 121 | else if (!strcmp(name, "virtual-root")) |
109 | cgit_virtual_root = xstrdup(value); | 122 | cgit_virtual_root = xstrdup(value); |
110 | else if (!strcmp(name, "nocache")) | 123 | else if (!strcmp(name, "nocache")) |
111 | cgit_nocache = atoi(value); | 124 | cgit_nocache = atoi(value); |
112 | else if (!strcmp(name, "snapshots")) | 125 | else if (!strcmp(name, "snapshots")) |
113 | cgit_snapshots = atoi(value); | 126 | cgit_snapshots = atoi(value); |
114 | else if (!strcmp(name, "enable-log-filecount")) | 127 | else if (!strcmp(name, "enable-log-filecount")) |
115 | cgit_enable_log_filecount = atoi(value); | 128 | cgit_enable_log_filecount = atoi(value); |
116 | else if (!strcmp(name, "enable-log-linecount")) | 129 | else if (!strcmp(name, "enable-log-linecount")) |
117 | cgit_enable_log_linecount = atoi(value); | 130 | cgit_enable_log_linecount = atoi(value); |
118 | else if (!strcmp(name, "cache-root")) | 131 | else if (!strcmp(name, "cache-root")) |
119 | cgit_cache_root = xstrdup(value); | 132 | cgit_cache_root = xstrdup(value); |
120 | else if (!strcmp(name, "cache-root-ttl")) | 133 | else if (!strcmp(name, "cache-root-ttl")) |
121 | cgit_cache_root_ttl = atoi(value); | 134 | cgit_cache_root_ttl = atoi(value); |
122 | else if (!strcmp(name, "cache-repo-ttl")) | 135 | else if (!strcmp(name, "cache-repo-ttl")) |
123 | cgit_cache_repo_ttl = atoi(value); | 136 | cgit_cache_repo_ttl = atoi(value); |
124 | else if (!strcmp(name, "cache-static-ttl")) | 137 | else if (!strcmp(name, "cache-static-ttl")) |
125 | cgit_cache_static_ttl = atoi(value); | 138 | cgit_cache_static_ttl = atoi(value); |
126 | else if (!strcmp(name, "cache-dynamic-ttl")) | 139 | else if (!strcmp(name, "cache-dynamic-ttl")) |
127 | cgit_cache_dynamic_ttl = atoi(value); | 140 | cgit_cache_dynamic_ttl = atoi(value); |
128 | else if (!strcmp(name, "max-message-length")) | 141 | else if (!strcmp(name, "max-message-length")) |
129 | cgit_max_msg_len = atoi(value); | 142 | cgit_max_msg_len = atoi(value); |
130 | else if (!strcmp(name, "max-repodesc-length")) | 143 | else if (!strcmp(name, "max-repodesc-length")) |
131 | cgit_max_repodesc_len = atoi(value); | 144 | cgit_max_repodesc_len = atoi(value); |
132 | else if (!strcmp(name, "max-commit-count")) | 145 | else if (!strcmp(name, "max-commit-count")) |
133 | cgit_max_commit_count = atoi(value); | 146 | cgit_max_commit_count = atoi(value); |
134 | else if (!strcmp(name, "repo.url")) | 147 | else if (!strcmp(name, "repo.url")) |
135 | cgit_repo = add_repo(value); | 148 | cgit_repo = add_repo(value); |
136 | else if (!strcmp(name, "repo.name")) | 149 | else if (!strcmp(name, "repo.name")) |
137 | cgit_repo->name = xstrdup(value); | 150 | cgit_repo->name = xstrdup(value); |
138 | else if (cgit_repo && !strcmp(name, "repo.path")) | 151 | else if (cgit_repo && !strcmp(name, "repo.path")) |
139 | cgit_repo->path = xstrdup(value); | 152 | cgit_repo->path = xstrdup(value); |
140 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 153 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
141 | cgit_repo->desc = xstrdup(value); | 154 | cgit_repo->desc = xstrdup(value); |
142 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 155 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
143 | cgit_repo->owner = xstrdup(value); | 156 | cgit_repo->owner = xstrdup(value); |
144 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 157 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
145 | cgit_repo->defbranch = xstrdup(value); | 158 | cgit_repo->defbranch = xstrdup(value); |
146 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 159 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
147 | cgit_repo->snapshots = cgit_snapshots * atoi(value); | 160 | cgit_repo->snapshots = cgit_snapshots * atoi(value); |
148 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 161 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
149 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 162 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
150 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 163 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
151 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 164 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
152 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 165 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
153 | cgit_repo->module_link= xstrdup(value); | 166 | cgit_repo->module_link= xstrdup(value); |
154 | else if (!strcmp(name, "include")) | 167 | else if (!strcmp(name, "include")) |
155 | cgit_read_config(value, cgit_global_config_cb); | 168 | cgit_read_config(value, cgit_global_config_cb); |
156 | } | 169 | } |
157 | 170 | ||
158 | void cgit_querystring_cb(const char *name, const char *value) | 171 | void cgit_querystring_cb(const char *name, const char *value) |
159 | { | 172 | { |
160 | if (!strcmp(name,"r")) { | 173 | if (!strcmp(name,"r")) { |
161 | cgit_query_repo = xstrdup(value); | 174 | cgit_query_repo = xstrdup(value); |
162 | } else if (!strcmp(name, "p")) { | 175 | } else if (!strcmp(name, "p")) { |
163 | cgit_query_page = xstrdup(value); | 176 | cgit_query_page = xstrdup(value); |
164 | } else if (!strcmp(name, "q")) { | 177 | } else if (!strcmp(name, "q")) { |
165 | cgit_query_search = xstrdup(value); | 178 | cgit_query_search = xstrdup(value); |
166 | } else if (!strcmp(name, "h")) { | 179 | } else if (!strcmp(name, "h")) { |
167 | cgit_query_head = xstrdup(value); | 180 | cgit_query_head = xstrdup(value); |
168 | cgit_query_has_symref = 1; | 181 | cgit_query_has_symref = 1; |
169 | } else if (!strcmp(name, "id")) { | 182 | } else if (!strcmp(name, "id")) { |
170 | cgit_query_sha1 = xstrdup(value); | 183 | cgit_query_sha1 = xstrdup(value); |
171 | cgit_query_has_sha1 = 1; | 184 | cgit_query_has_sha1 = 1; |
172 | } else if (!strcmp(name, "id2")) { | 185 | } else if (!strcmp(name, "id2")) { |
173 | cgit_query_sha2 = xstrdup(value); | 186 | cgit_query_sha2 = xstrdup(value); |
174 | cgit_query_has_sha1 = 1; | 187 | cgit_query_has_sha1 = 1; |
175 | } else if (!strcmp(name, "ofs")) { | 188 | } else if (!strcmp(name, "ofs")) { |
176 | cgit_query_ofs = atoi(value); | 189 | cgit_query_ofs = atoi(value); |
177 | } else if (!strcmp(name, "path")) { | 190 | } else if (!strcmp(name, "path")) { |
178 | cgit_query_path = xstrdup(value); | 191 | cgit_query_path = xstrdup(value); |
179 | } else if (!strcmp(name, "name")) { | 192 | } else if (!strcmp(name, "name")) { |
180 | cgit_query_name = xstrdup(value); | 193 | cgit_query_name = xstrdup(value); |
181 | } | 194 | } |
182 | } | 195 | } |
183 | 196 | ||
184 | void *cgit_free_commitinfo(struct commitinfo *info) | 197 | void *cgit_free_commitinfo(struct commitinfo *info) |
185 | { | 198 | { |
186 | free(info->author); | 199 | free(info->author); |
187 | free(info->author_email); | 200 | free(info->author_email); |
188 | free(info->committer); | 201 | free(info->committer); |
189 | free(info->committer_email); | 202 | free(info->committer_email); |
190 | free(info->subject); | 203 | free(info->subject); |
191 | free(info); | 204 | free(info); |
192 | return NULL; | 205 | return NULL; |
193 | } | 206 | } |
194 | 207 | ||
195 | int hextoint(char c) | 208 | int hextoint(char c) |
196 | { | 209 | { |
197 | if (c >= 'a' && c <= 'f') | 210 | if (c >= 'a' && c <= 'f') |
198 | return 10 + c - 'a'; | 211 | return 10 + c - 'a'; |
199 | else if (c >= 'A' && c <= 'F') | 212 | else if (c >= 'A' && c <= 'F') |
200 | return 10 + c - 'A'; | 213 | return 10 + c - 'A'; |
201 | else if (c >= '0' && c <= '9') | 214 | else if (c >= '0' && c <= '9') |
202 | return c - '0'; | 215 | return c - '0'; |
203 | else | 216 | else |
204 | return -1; | 217 | return -1; |
205 | } | 218 | } |
206 | 219 | ||
207 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 220 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
208 | struct diff_options *options, void *data) | 221 | struct diff_options *options, void *data) |
209 | { | 222 | { |
210 | int i; | 223 | int i; |
211 | 224 | ||
212 | for (i = 0; i < q->nr; i++) { | 225 | for (i = 0; i < q->nr; i++) { |
213 | if (q->queue[i]->status == 'U') | 226 | if (q->queue[i]->status == 'U') |
214 | continue; | 227 | continue; |
215 | ((filepair_fn)data)(q->queue[i]); | 228 | ((filepair_fn)data)(q->queue[i]); |
216 | } | 229 | } |
217 | } | 230 | } |
218 | 231 | ||
219 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 232 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
220 | { | 233 | { |
221 | enum object_type type; | 234 | enum object_type type; |
222 | 235 | ||
223 | if (is_null_sha1(sha1)) { | 236 | if (is_null_sha1(sha1)) { |
224 | file->ptr = (char *)""; | 237 | file->ptr = (char *)""; |
225 | file->size = 0; | 238 | file->size = 0; |
226 | } else { | 239 | } else { |
227 | file->ptr = read_sha1_file(sha1, &type, &file->size); | 240 | file->ptr = read_sha1_file(sha1, &type, &file->size); |
228 | } | 241 | } |
229 | return 1; | 242 | return 1; |
230 | } | 243 | } |
231 | 244 | ||
232 | /* | 245 | /* |
233 | * Receive diff-buffers from xdiff and concatenate them as | 246 | * Receive diff-buffers from xdiff and concatenate them as |
234 | * needed across multiple callbacks. | 247 | * needed across multiple callbacks. |
235 | * | 248 | * |
236 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), | 249 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
237 | * ripped from git and modified to use globals instead of | 250 | * ripped from git and modified to use globals instead of |
238 | * a special callback-struct. | 251 | * a special callback-struct. |
239 | */ | 252 | */ |
240 | char *diffbuf = NULL; | 253 | char *diffbuf = NULL; |
241 | int buflen = 0; | 254 | int buflen = 0; |
242 | 255 | ||
243 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | 256 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
244 | { | 257 | { |
245 | int i; | 258 | int i; |
246 | 259 | ||
247 | for (i = 0; i < nbuf; i++) { | 260 | for (i = 0; i < nbuf; i++) { |
248 | if (mb[i].ptr[mb[i].size-1] != '\n') { | 261 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
249 | /* Incomplete line */ | 262 | /* Incomplete line */ |
250 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 263 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
251 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 264 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
252 | buflen += mb[i].size; | 265 | buflen += mb[i].size; |
253 | continue; | 266 | continue; |
254 | } | 267 | } |
255 | 268 | ||
256 | /* we have a complete line */ | 269 | /* we have a complete line */ |
257 | if (!diffbuf) { | 270 | if (!diffbuf) { |
258 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 271 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
259 | continue; | 272 | continue; |
260 | } | 273 | } |
261 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 274 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
262 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 275 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
263 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 276 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
264 | free(diffbuf); | 277 | free(diffbuf); |
265 | diffbuf = NULL; | 278 | diffbuf = NULL; |
266 | buflen = 0; | 279 | buflen = 0; |
267 | } | 280 | } |
268 | if (diffbuf) { | 281 | if (diffbuf) { |
269 | ((linediff_fn)priv)(diffbuf, buflen); | 282 | ((linediff_fn)priv)(diffbuf, buflen); |
270 | free(diffbuf); | 283 | free(diffbuf); |
271 | diffbuf = NULL; | 284 | diffbuf = NULL; |
272 | buflen = 0; | 285 | buflen = 0; |
273 | } | 286 | } |
274 | return 0; | 287 | return 0; |
275 | } | 288 | } |
276 | 289 | ||
277 | int cgit_diff_files(const unsigned char *old_sha1, | 290 | int cgit_diff_files(const unsigned char *old_sha1, |
278 | const unsigned char *new_sha1, | 291 | const unsigned char *new_sha1, |
279 | linediff_fn fn) | 292 | linediff_fn fn) |
280 | { | 293 | { |
281 | mmfile_t file1, file2; | 294 | mmfile_t file1, file2; |
282 | xpparam_t diff_params; | 295 | xpparam_t diff_params; |
283 | xdemitconf_t emit_params; | 296 | xdemitconf_t emit_params; |
284 | xdemitcb_t emit_cb; | 297 | xdemitcb_t emit_cb; |
285 | 298 | ||
286 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 299 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
287 | return 1; | 300 | return 1; |
288 | 301 | ||
289 | diff_params.flags = XDF_NEED_MINIMAL; | 302 | diff_params.flags = XDF_NEED_MINIMAL; |
290 | emit_params.ctxlen = 3; | 303 | emit_params.ctxlen = 3; |
291 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 304 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
292 | emit_cb.outf = filediff_cb; | 305 | emit_cb.outf = filediff_cb; |
293 | emit_cb.priv = fn; | 306 | emit_cb.priv = fn; |
294 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 307 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
295 | return 0; | 308 | return 0; |
296 | } | 309 | } |
297 | 310 | ||
298 | void cgit_diff_tree(const unsigned char *old_sha1, | 311 | void cgit_diff_tree(const unsigned char *old_sha1, |
299 | const unsigned char *new_sha1, | 312 | const unsigned char *new_sha1, |
300 | filepair_fn fn) | 313 | filepair_fn fn) |
301 | { | 314 | { |
302 | struct diff_options opt; | 315 | struct diff_options opt; |
303 | int ret; | 316 | int ret; |
304 | 317 | ||
305 | diff_setup(&opt); | 318 | diff_setup(&opt); |
306 | opt.output_format = DIFF_FORMAT_CALLBACK; | 319 | opt.output_format = DIFF_FORMAT_CALLBACK; |
307 | opt.detect_rename = 1; | 320 | opt.detect_rename = 1; |
308 | opt.recursive = 1; | 321 | opt.recursive = 1; |
309 | opt.format_callback = cgit_diff_tree_cb; | 322 | opt.format_callback = cgit_diff_tree_cb; |
310 | opt.format_callback_data = fn; | 323 | opt.format_callback_data = fn; |
311 | diff_setup_done(&opt); | 324 | diff_setup_done(&opt); |
312 | 325 | ||
313 | if (old_sha1) | 326 | if (old_sha1) |
314 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 327 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
315 | else | 328 | else |
316 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 329 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
317 | diffcore_std(&opt); | 330 | diffcore_std(&opt); |
318 | diff_flush(&opt); | 331 | diff_flush(&opt); |
319 | } | 332 | } |
320 | 333 | ||
321 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 334 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
322 | { | 335 | { |
323 | unsigned char *old_sha1 = NULL; | 336 | unsigned char *old_sha1 = NULL; |
324 | 337 | ||
325 | if (commit->parents) | 338 | if (commit->parents) |
326 | old_sha1 = commit->parents->item->object.sha1; | 339 | old_sha1 = commit->parents->item->object.sha1; |
327 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); | 340 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
328 | } | 341 | } |