summaryrefslogtreecommitdiffabout
path: root/shared.c
Unidiff
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 50fe8e1..e06df91 100644
--- a/shared.c
+++ b/shared.c
@@ -1,478 +1,509 @@
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
11struct repolist cgit_repolist; 11struct repolist cgit_repolist;
12struct repoinfo *cgit_repo; 12struct repoinfo *cgit_repo;
13int cgit_cmd; 13int cgit_cmd;
14 14
15const char *cgit_version = CGIT_VERSION; 15const char *cgit_version = CGIT_VERSION;
16 16
17char *cgit_root_title = "Git repository browser"; 17char *cgit_root_title = "Git repository browser";
18char *cgit_css = "/cgit.css"; 18char *cgit_css = "/cgit.css";
19char *cgit_logo = "/git-logo.png"; 19char *cgit_logo = "/git-logo.png";
20char *cgit_index_header = NULL; 20char *cgit_index_header = NULL;
21char *cgit_index_info = NULL; 21char *cgit_index_info = NULL;
22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 22char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
23char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 23char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
24char *cgit_agefile = "info/web/last-modified"; 24char *cgit_agefile = "info/web/last-modified";
25char *cgit_virtual_root = NULL; 25char *cgit_virtual_root = NULL;
26char *cgit_script_name = CGIT_SCRIPT_NAME; 26char *cgit_script_name = CGIT_SCRIPT_NAME;
27char *cgit_cache_root = CGIT_CACHE_ROOT; 27char *cgit_cache_root = CGIT_CACHE_ROOT;
28char *cgit_repo_group = NULL; 28char *cgit_repo_group = NULL;
29 29
30int cgit_nocache = 0; 30int cgit_nocache = 0;
31int cgit_snapshots = 0; 31int cgit_snapshots = 0;
32int cgit_enable_index_links = 0; 32int cgit_enable_index_links = 0;
33int cgit_enable_log_filecount = 0; 33int cgit_enable_log_filecount = 0;
34int cgit_enable_log_linecount = 0; 34int cgit_enable_log_linecount = 0;
35int cgit_max_lock_attempts = 5; 35int cgit_max_lock_attempts = 5;
36int cgit_cache_root_ttl = 5; 36int cgit_cache_root_ttl = 5;
37int cgit_cache_repo_ttl = 5; 37int cgit_cache_repo_ttl = 5;
38int cgit_cache_dynamic_ttl = 5; 38int cgit_cache_dynamic_ttl = 5;
39int cgit_cache_static_ttl = -1; 39int cgit_cache_static_ttl = -1;
40int cgit_cache_max_create_time = 5; 40int cgit_cache_max_create_time = 5;
41int cgit_summary_log = 0; 41int cgit_summary_log = 0;
42int cgit_summary_tags = 0; 42int cgit_summary_tags = 0;
43int cgit_summary_branches = 0; 43int cgit_summary_branches = 0;
44int cgit_renamelimit = -1; 44int cgit_renamelimit = -1;
45 45
46int cgit_max_msg_len = 60; 46int cgit_max_msg_len = 60;
47int cgit_max_repodesc_len = 60; 47int cgit_max_repodesc_len = 60;
48int cgit_max_commit_count = 50; 48int cgit_max_commit_count = 50;
49 49
50int cgit_query_has_symref = 0; 50int cgit_query_has_symref = 0;
51int cgit_query_has_sha1 = 0; 51int cgit_query_has_sha1 = 0;
52 52
53char *cgit_querystring = NULL; 53char *cgit_querystring = NULL;
54char *cgit_query_repo = NULL; 54char *cgit_query_repo = NULL;
55char *cgit_query_page = NULL; 55char *cgit_query_page = NULL;
56char *cgit_query_head = NULL; 56char *cgit_query_head = NULL;
57char *cgit_query_search = NULL; 57char *cgit_query_search = NULL;
58char *cgit_query_grep = NULL; 58char *cgit_query_grep = NULL;
59char *cgit_query_sha1 = NULL; 59char *cgit_query_sha1 = NULL;
60char *cgit_query_sha2 = NULL; 60char *cgit_query_sha2 = NULL;
61char *cgit_query_path = NULL; 61char *cgit_query_path = NULL;
62char *cgit_query_name = NULL; 62char *cgit_query_name = NULL;
63int cgit_query_ofs = 0; 63int cgit_query_ofs = 0;
64 64
65int htmlfd = 0; 65int htmlfd = 0;
66 66
67 67
68int cgit_get_cmd_index(const char *cmd) 68int cgit_get_cmd_index(const char *cmd)
69{ 69{
70 static char *cmds[] = {"log", "commit", "diff", "tree", "blob", 70 static char *cmds[] = {"log", "commit", "diff", "tree", "blob",
71 "snapshot", "tag", "refs", NULL}; 71 "snapshot", "tag", "refs", NULL};
72 int i; 72 int i;
73 73
74 for(i = 0; cmds[i]; i++) 74 for(i = 0; cmds[i]; i++)
75 if (!strcmp(cmd, cmds[i])) 75 if (!strcmp(cmd, cmds[i]))
76 return i + 1; 76 return i + 1;
77 return 0; 77 return 0;
78} 78}
79 79
80int chk_zero(int result, char *msg) 80int chk_zero(int result, char *msg)
81{ 81{
82 if (result != 0) 82 if (result != 0)
83 die("%s: %s", msg, strerror(errno)); 83 die("%s: %s", msg, strerror(errno));
84 return result; 84 return result;
85} 85}
86 86
87int chk_positive(int result, char *msg) 87int chk_positive(int result, char *msg)
88{ 88{
89 if (result <= 0) 89 if (result <= 0)
90 die("%s: %s", msg, strerror(errno)); 90 die("%s: %s", msg, strerror(errno));
91 return result; 91 return result;
92} 92}
93 93
94int chk_non_negative(int result, char *msg) 94int chk_non_negative(int result, char *msg)
95{ 95{
96 if (result < 0) 96 if (result < 0)
97 die("%s: %s",msg, strerror(errno)); 97 die("%s: %s",msg, strerror(errno));
98 return result; 98 return result;
99} 99}
100 100
101struct repoinfo *add_repo(const char *url) 101struct repoinfo *add_repo(const char *url)
102{ 102{
103 struct repoinfo *ret; 103 struct repoinfo *ret;
104 104
105 if (++cgit_repolist.count > cgit_repolist.length) { 105 if (++cgit_repolist.count > cgit_repolist.length) {
106 if (cgit_repolist.length == 0) 106 if (cgit_repolist.length == 0)
107 cgit_repolist.length = 8; 107 cgit_repolist.length = 8;
108 else 108 else
109 cgit_repolist.length *= 2; 109 cgit_repolist.length *= 2;
110 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 110 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
111 cgit_repolist.length * 111 cgit_repolist.length *
112 sizeof(struct repoinfo)); 112 sizeof(struct repoinfo));
113 } 113 }
114 114
115 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 115 ret = &cgit_repolist.repos[cgit_repolist.count-1];
116 ret->url = trim_end(url, '/'); 116 ret->url = trim_end(url, '/');
117 ret->name = ret->url; 117 ret->name = ret->url;
118 ret->path = NULL; 118 ret->path = NULL;
119 ret->desc = NULL; 119 ret->desc = NULL;
120 ret->owner = NULL; 120 ret->owner = NULL;
121 ret->group = cgit_repo_group; 121 ret->group = cgit_repo_group;
122 ret->defbranch = "master"; 122 ret->defbranch = "master";
123 ret->snapshots = cgit_snapshots; 123 ret->snapshots = cgit_snapshots;
124 ret->enable_log_filecount = cgit_enable_log_filecount; 124 ret->enable_log_filecount = cgit_enable_log_filecount;
125 ret->enable_log_linecount = cgit_enable_log_linecount; 125 ret->enable_log_linecount = cgit_enable_log_linecount;
126 ret->module_link = cgit_module_link; 126 ret->module_link = cgit_module_link;
127 ret->readme = NULL; 127 ret->readme = NULL;
128 return ret; 128 return ret;
129} 129}
130 130
131struct repoinfo *cgit_get_repoinfo(const char *url) 131struct repoinfo *cgit_get_repoinfo(const char *url)
132{ 132{
133 int i; 133 int i;
134 struct repoinfo *repo; 134 struct repoinfo *repo;
135 135
136 for (i=0; i<cgit_repolist.count; i++) { 136 for (i=0; i<cgit_repolist.count; i++) {
137 repo = &cgit_repolist.repos[i]; 137 repo = &cgit_repolist.repos[i];
138 if (!strcmp(repo->url, url)) 138 if (!strcmp(repo->url, url))
139 return repo; 139 return repo;
140 } 140 }
141 return NULL; 141 return NULL;
142} 142}
143 143
144void cgit_global_config_cb(const char *name, const char *value) 144void cgit_global_config_cb(const char *name, const char *value)
145{ 145{
146 if (!strcmp(name, "root-title")) 146 if (!strcmp(name, "root-title"))
147 cgit_root_title = xstrdup(value); 147 cgit_root_title = xstrdup(value);
148 else if (!strcmp(name, "css")) 148 else if (!strcmp(name, "css"))
149 cgit_css = xstrdup(value); 149 cgit_css = xstrdup(value);
150 else if (!strcmp(name, "logo")) 150 else if (!strcmp(name, "logo"))
151 cgit_logo = xstrdup(value); 151 cgit_logo = xstrdup(value);
152 else if (!strcmp(name, "index-header")) 152 else if (!strcmp(name, "index-header"))
153 cgit_index_header = xstrdup(value); 153 cgit_index_header = xstrdup(value);
154 else if (!strcmp(name, "index-info")) 154 else if (!strcmp(name, "index-info"))
155 cgit_index_info = xstrdup(value); 155 cgit_index_info = xstrdup(value);
156 else if (!strcmp(name, "logo-link")) 156 else if (!strcmp(name, "logo-link"))
157 cgit_logo_link = xstrdup(value); 157 cgit_logo_link = xstrdup(value);
158 else if (!strcmp(name, "module-link")) 158 else if (!strcmp(name, "module-link"))
159 cgit_module_link = xstrdup(value); 159 cgit_module_link = xstrdup(value);
160 else if (!strcmp(name, "virtual-root")) 160 else if (!strcmp(name, "virtual-root"))
161 cgit_virtual_root = trim_end(value, '/'); 161 cgit_virtual_root = trim_end(value, '/');
162 else if (!strcmp(name, "nocache")) 162 else if (!strcmp(name, "nocache"))
163 cgit_nocache = atoi(value); 163 cgit_nocache = atoi(value);
164 else if (!strcmp(name, "snapshots")) 164 else if (!strcmp(name, "snapshots"))
165 cgit_snapshots = cgit_parse_snapshots_mask(value); 165 cgit_snapshots = cgit_parse_snapshots_mask(value);
166 else if (!strcmp(name, "enable-index-links")) 166 else if (!strcmp(name, "enable-index-links"))
167 cgit_enable_index_links = atoi(value); 167 cgit_enable_index_links = atoi(value);
168 else if (!strcmp(name, "enable-log-filecount")) 168 else if (!strcmp(name, "enable-log-filecount"))
169 cgit_enable_log_filecount = atoi(value); 169 cgit_enable_log_filecount = atoi(value);
170 else if (!strcmp(name, "enable-log-linecount")) 170 else if (!strcmp(name, "enable-log-linecount"))
171 cgit_enable_log_linecount = atoi(value); 171 cgit_enable_log_linecount = atoi(value);
172 else if (!strcmp(name, "cache-root")) 172 else if (!strcmp(name, "cache-root"))
173 cgit_cache_root = xstrdup(value); 173 cgit_cache_root = xstrdup(value);
174 else if (!strcmp(name, "cache-root-ttl")) 174 else if (!strcmp(name, "cache-root-ttl"))
175 cgit_cache_root_ttl = atoi(value); 175 cgit_cache_root_ttl = atoi(value);
176 else if (!strcmp(name, "cache-repo-ttl")) 176 else if (!strcmp(name, "cache-repo-ttl"))
177 cgit_cache_repo_ttl = atoi(value); 177 cgit_cache_repo_ttl = atoi(value);
178 else if (!strcmp(name, "cache-static-ttl")) 178 else if (!strcmp(name, "cache-static-ttl"))
179 cgit_cache_static_ttl = atoi(value); 179 cgit_cache_static_ttl = atoi(value);
180 else if (!strcmp(name, "cache-dynamic-ttl")) 180 else if (!strcmp(name, "cache-dynamic-ttl"))
181 cgit_cache_dynamic_ttl = atoi(value); 181 cgit_cache_dynamic_ttl = atoi(value);
182 else if (!strcmp(name, "max-message-length")) 182 else if (!strcmp(name, "max-message-length"))
183 cgit_max_msg_len = atoi(value); 183 cgit_max_msg_len = atoi(value);
184 else if (!strcmp(name, "max-repodesc-length")) 184 else if (!strcmp(name, "max-repodesc-length"))
185 cgit_max_repodesc_len = atoi(value); 185 cgit_max_repodesc_len = atoi(value);
186 else if (!strcmp(name, "max-commit-count")) 186 else if (!strcmp(name, "max-commit-count"))
187 cgit_max_commit_count = atoi(value); 187 cgit_max_commit_count = atoi(value);
188 else if (!strcmp(name, "summary-log")) 188 else if (!strcmp(name, "summary-log"))
189 cgit_summary_log = atoi(value); 189 cgit_summary_log = atoi(value);
190 else if (!strcmp(name, "summary-branches")) 190 else if (!strcmp(name, "summary-branches"))
191 cgit_summary_branches = atoi(value); 191 cgit_summary_branches = atoi(value);
192 else if (!strcmp(name, "summary-tags")) 192 else if (!strcmp(name, "summary-tags"))
193 cgit_summary_tags = atoi(value); 193 cgit_summary_tags = atoi(value);
194 else if (!strcmp(name, "agefile")) 194 else if (!strcmp(name, "agefile"))
195 cgit_agefile = xstrdup(value); 195 cgit_agefile = xstrdup(value);
196 else if (!strcmp(name, "renamelimit")) 196 else if (!strcmp(name, "renamelimit"))
197 cgit_renamelimit = atoi(value); 197 cgit_renamelimit = atoi(value);
198 else if (!strcmp(name, "repo.group")) 198 else if (!strcmp(name, "repo.group"))
199 cgit_repo_group = xstrdup(value); 199 cgit_repo_group = xstrdup(value);
200 else if (!strcmp(name, "repo.url")) 200 else if (!strcmp(name, "repo.url"))
201 cgit_repo = add_repo(value); 201 cgit_repo = add_repo(value);
202 else if (!strcmp(name, "repo.name")) 202 else if (!strcmp(name, "repo.name"))
203 cgit_repo->name = xstrdup(value); 203 cgit_repo->name = xstrdup(value);
204 else if (cgit_repo && !strcmp(name, "repo.path")) 204 else if (cgit_repo && !strcmp(name, "repo.path"))
205 cgit_repo->path = trim_end(value, '/'); 205 cgit_repo->path = trim_end(value, '/');
206 else if (cgit_repo && !strcmp(name, "repo.desc")) 206 else if (cgit_repo && !strcmp(name, "repo.desc"))
207 cgit_repo->desc = xstrdup(value); 207 cgit_repo->desc = xstrdup(value);
208 else if (cgit_repo && !strcmp(name, "repo.owner")) 208 else if (cgit_repo && !strcmp(name, "repo.owner"))
209 cgit_repo->owner = xstrdup(value); 209 cgit_repo->owner = xstrdup(value);
210 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 210 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
211 cgit_repo->defbranch = xstrdup(value); 211 cgit_repo->defbranch = xstrdup(value);
212 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 212 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
213 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ 213 cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */
214 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 214 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
215 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); 215 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
216 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 216 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
217 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); 217 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
218 else if (cgit_repo && !strcmp(name, "repo.module-link")) 218 else if (cgit_repo && !strcmp(name, "repo.module-link"))
219 cgit_repo->module_link= xstrdup(value); 219 cgit_repo->module_link= xstrdup(value);
220 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { 220 else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) {
221 if (*value == '/') 221 if (*value == '/')
222 cgit_repo->readme = xstrdup(value); 222 cgit_repo->readme = xstrdup(value);
223 else 223 else
224 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); 224 cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value));
225 } else if (!strcmp(name, "include")) 225 } else if (!strcmp(name, "include"))
226 cgit_read_config(value, cgit_global_config_cb); 226 cgit_read_config(value, cgit_global_config_cb);
227} 227}
228 228
229void cgit_querystring_cb(const char *name, const char *value) 229void cgit_querystring_cb(const char *name, const char *value)
230{ 230{
231 if (!strcmp(name,"r")) { 231 if (!strcmp(name,"r")) {
232 cgit_query_repo = xstrdup(value); 232 cgit_query_repo = xstrdup(value);
233 cgit_repo = cgit_get_repoinfo(value); 233 cgit_repo = cgit_get_repoinfo(value);
234 } else if (!strcmp(name, "p")) { 234 } else if (!strcmp(name, "p")) {
235 cgit_query_page = xstrdup(value); 235 cgit_query_page = xstrdup(value);
236 cgit_cmd = cgit_get_cmd_index(value); 236 cgit_cmd = cgit_get_cmd_index(value);
237 } else if (!strcmp(name, "url")) { 237 } else if (!strcmp(name, "url")) {
238 cgit_parse_url(value); 238 cgit_parse_url(value);
239 } else if (!strcmp(name, "qt")) { 239 } else if (!strcmp(name, "qt")) {
240 cgit_query_grep = xstrdup(value); 240 cgit_query_grep = xstrdup(value);
241 } else if (!strcmp(name, "q")) { 241 } else if (!strcmp(name, "q")) {
242 cgit_query_search = xstrdup(value); 242 cgit_query_search = xstrdup(value);
243 } else if (!strcmp(name, "h")) { 243 } else if (!strcmp(name, "h")) {
244 cgit_query_head = xstrdup(value); 244 cgit_query_head = xstrdup(value);
245 cgit_query_has_symref = 1; 245 cgit_query_has_symref = 1;
246 } else if (!strcmp(name, "id")) { 246 } else if (!strcmp(name, "id")) {
247 cgit_query_sha1 = xstrdup(value); 247 cgit_query_sha1 = xstrdup(value);
248 cgit_query_has_sha1 = 1; 248 cgit_query_has_sha1 = 1;
249 } else if (!strcmp(name, "id2")) { 249 } else if (!strcmp(name, "id2")) {
250 cgit_query_sha2 = xstrdup(value); 250 cgit_query_sha2 = xstrdup(value);
251 cgit_query_has_sha1 = 1; 251 cgit_query_has_sha1 = 1;
252 } else if (!strcmp(name, "ofs")) { 252 } else if (!strcmp(name, "ofs")) {
253 cgit_query_ofs = atoi(value); 253 cgit_query_ofs = atoi(value);
254 } else if (!strcmp(name, "path")) { 254 } else if (!strcmp(name, "path")) {
255 cgit_query_path = trim_end(value, '/'); 255 cgit_query_path = trim_end(value, '/');
256 } else if (!strcmp(name, "name")) { 256 } else if (!strcmp(name, "name")) {
257 cgit_query_name = xstrdup(value); 257 cgit_query_name = xstrdup(value);
258 } 258 }
259} 259}
260 260
261void *cgit_free_commitinfo(struct commitinfo *info) 261void *cgit_free_commitinfo(struct commitinfo *info)
262{ 262{
263 free(info->author); 263 free(info->author);
264 free(info->author_email); 264 free(info->author_email);
265 free(info->committer); 265 free(info->committer);
266 free(info->committer_email); 266 free(info->committer_email);
267 free(info->subject); 267 free(info->subject);
268 free(info); 268 free(info);
269 return NULL; 269 return NULL;
270} 270}
271 271
272int hextoint(char c) 272int hextoint(char c)
273{ 273{
274 if (c >= 'a' && c <= 'f') 274 if (c >= 'a' && c <= 'f')
275 return 10 + c - 'a'; 275 return 10 + c - 'a';
276 else if (c >= 'A' && c <= 'F') 276 else if (c >= 'A' && c <= 'F')
277 return 10 + c - 'A'; 277 return 10 + c - 'A';
278 else if (c >= '0' && c <= '9') 278 else if (c >= '0' && c <= '9')
279 return c - '0'; 279 return c - '0';
280 else 280 else
281 return -1; 281 return -1;
282} 282}
283 283
284char *trim_end(const char *str, char c) 284char *trim_end(const char *str, char c)
285{ 285{
286 int len; 286 int len;
287 char *s, *t; 287 char *s, *t;
288 288
289 if (str == NULL) 289 if (str == NULL)
290 return NULL; 290 return NULL;
291 t = (char *)str; 291 t = (char *)str;
292 len = strlen(t); 292 len = strlen(t);
293 while(len > 0 && t[len - 1] == c) 293 while(len > 0 && t[len - 1] == c)
294 len--; 294 len--;
295 295
296 if (len == 0) 296 if (len == 0)
297 return NULL; 297 return NULL;
298 298
299 c = t[len]; 299 c = t[len];
300 t[len] = '\0'; 300 t[len] = '\0';
301 s = xstrdup(t); 301 s = xstrdup(t);
302 t[len] = c; 302 t[len] = c;
303 return s; 303 return s;
304} 304}
305 305
306char *strlpart(char *txt, int maxlen)
307{
308 char *result;
309
310 if (!txt)
311 return txt;
312
313 if (strlen(txt) <= maxlen)
314 return txt;
315 result = xmalloc(maxlen + 1);
316 memcpy(result, txt, maxlen - 3);
317 result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.';
318 result[maxlen] = '\0';
319 return result;
320}
321
322char *strrpart(char *txt, int maxlen)
323{
324 char *result;
325
326 if (!txt)
327 return txt;
328
329 if (strlen(txt) <= maxlen)
330 return txt;
331 result = xmalloc(maxlen + 1);
332 memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3);
333 result[0] = result[1] = result[2] = '.';
334 return result;
335}
336
306void cgit_add_ref(struct reflist *list, struct refinfo *ref) 337void cgit_add_ref(struct reflist *list, struct refinfo *ref)
307{ 338{
308 size_t size; 339 size_t size;
309 340
310 if (list->count >= list->alloc) { 341 if (list->count >= list->alloc) {
311 list->alloc += (list->alloc ? list->alloc : 4); 342 list->alloc += (list->alloc ? list->alloc : 4);
312 size = list->alloc * sizeof(struct refinfo *); 343 size = list->alloc * sizeof(struct refinfo *);
313 list->refs = xrealloc(list->refs, size); 344 list->refs = xrealloc(list->refs, size);
314 } 345 }
315 list->refs[list->count++] = ref; 346 list->refs[list->count++] = ref;
316} 347}
317 348
318struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) 349struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1)
319{ 350{
320 struct refinfo *ref; 351 struct refinfo *ref;
321 352
322 ref = xmalloc(sizeof (struct refinfo)); 353 ref = xmalloc(sizeof (struct refinfo));
323 ref->refname = xstrdup(refname); 354 ref->refname = xstrdup(refname);
324 ref->object = parse_object(sha1); 355 ref->object = parse_object(sha1);
325 switch (ref->object->type) { 356 switch (ref->object->type) {
326 case OBJ_TAG: 357 case OBJ_TAG:
327 ref->tag = cgit_parse_tag((struct tag *)ref->object); 358 ref->tag = cgit_parse_tag((struct tag *)ref->object);
328 break; 359 break;
329 case OBJ_COMMIT: 360 case OBJ_COMMIT:
330 ref->commit = cgit_parse_commit((struct commit *)ref->object); 361 ref->commit = cgit_parse_commit((struct commit *)ref->object);
331 break; 362 break;
332 } 363 }
333 return ref; 364 return ref;
334} 365}
335 366
336int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, 367int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags,
337 void *cb_data) 368 void *cb_data)
338{ 369{
339 struct reflist *list = (struct reflist *)cb_data; 370 struct reflist *list = (struct reflist *)cb_data;
340 struct refinfo *info = cgit_mk_refinfo(refname, sha1); 371 struct refinfo *info = cgit_mk_refinfo(refname, sha1);
341 372
342 if (info) 373 if (info)
343 cgit_add_ref(list, info); 374 cgit_add_ref(list, info);
344 return 0; 375 return 0;
345} 376}
346 377
347void cgit_diff_tree_cb(struct diff_queue_struct *q, 378void cgit_diff_tree_cb(struct diff_queue_struct *q,
348 struct diff_options *options, void *data) 379 struct diff_options *options, void *data)
349{ 380{
350 int i; 381 int i;
351 382
352 for (i = 0; i < q->nr; i++) { 383 for (i = 0; i < q->nr; i++) {
353 if (q->queue[i]->status == 'U') 384 if (q->queue[i]->status == 'U')
354 continue; 385 continue;
355 ((filepair_fn)data)(q->queue[i]); 386 ((filepair_fn)data)(q->queue[i]);
356 } 387 }
357} 388}
358 389
359static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 390static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
360{ 391{
361 enum object_type type; 392 enum object_type type;
362 393
363 if (is_null_sha1(sha1)) { 394 if (is_null_sha1(sha1)) {
364 file->ptr = (char *)""; 395 file->ptr = (char *)"";
365 file->size = 0; 396 file->size = 0;
366 } else { 397 } else {
367 file->ptr = read_sha1_file(sha1, &type, 398 file->ptr = read_sha1_file(sha1, &type,
368 (unsigned long *)&file->size); 399 (unsigned long *)&file->size);
369 } 400 }
370 return 1; 401 return 1;
371} 402}
372 403
373/* 404/*
374 * Receive diff-buffers from xdiff and concatenate them as 405 * Receive diff-buffers from xdiff and concatenate them as
375 * needed across multiple callbacks. 406 * needed across multiple callbacks.
376 * 407 *
377 * This is basically a copy of xdiff-interface.c/xdiff_outf(), 408 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
378 * ripped from git and modified to use globals instead of 409 * ripped from git and modified to use globals instead of
379 * a special callback-struct. 410 * a special callback-struct.
380 */ 411 */
381char *diffbuf = NULL; 412char *diffbuf = NULL;
382int buflen = 0; 413int buflen = 0;
383 414
384int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 415int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
385{ 416{
386 int i; 417 int i;
387 418
388 for (i = 0; i < nbuf; i++) { 419 for (i = 0; i < nbuf; i++) {
389 if (mb[i].ptr[mb[i].size-1] != '\n') { 420 if (mb[i].ptr[mb[i].size-1] != '\n') {
390 /* Incomplete line */ 421 /* Incomplete line */
391 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 422 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
392 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 423 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
393 buflen += mb[i].size; 424 buflen += mb[i].size;
394 continue; 425 continue;
395 } 426 }
396 427
397 /* we have a complete line */ 428 /* we have a complete line */
398 if (!diffbuf) { 429 if (!diffbuf) {
399 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 430 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
400 continue; 431 continue;
401 } 432 }
402 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 433 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
403 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 434 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
404 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 435 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
405 free(diffbuf); 436 free(diffbuf);
406 diffbuf = NULL; 437 diffbuf = NULL;
407 buflen = 0; 438 buflen = 0;
408 } 439 }
409 if (diffbuf) { 440 if (diffbuf) {
410 ((linediff_fn)priv)(diffbuf, buflen); 441 ((linediff_fn)priv)(diffbuf, buflen);
411 free(diffbuf); 442 free(diffbuf);
412 diffbuf = NULL; 443 diffbuf = NULL;
413 buflen = 0; 444 buflen = 0;
414 } 445 }
415 return 0; 446 return 0;
416} 447}
417 448
418int cgit_diff_files(const unsigned char *old_sha1, 449int cgit_diff_files(const unsigned char *old_sha1,
419 const unsigned char *new_sha1, 450 const unsigned char *new_sha1,
420 linediff_fn fn) 451 linediff_fn fn)
421{ 452{
422 mmfile_t file1, file2; 453 mmfile_t file1, file2;
423 xpparam_t diff_params; 454 xpparam_t diff_params;
424 xdemitconf_t emit_params; 455 xdemitconf_t emit_params;
425 xdemitcb_t emit_cb; 456 xdemitcb_t emit_cb;
426 457
427 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 458 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
428 return 1; 459 return 1;
429 460
430 diff_params.flags = XDF_NEED_MINIMAL; 461 diff_params.flags = XDF_NEED_MINIMAL;
431 emit_params.ctxlen = 3; 462 emit_params.ctxlen = 3;
432 emit_params.flags = XDL_EMIT_FUNCNAMES; 463 emit_params.flags = XDL_EMIT_FUNCNAMES;
433 emit_params.find_func = NULL; 464 emit_params.find_func = NULL;
434 emit_cb.outf = filediff_cb; 465 emit_cb.outf = filediff_cb;
435 emit_cb.priv = fn; 466 emit_cb.priv = fn;
436 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 467 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
437 return 0; 468 return 0;
438} 469}
439 470
440void cgit_diff_tree(const unsigned char *old_sha1, 471void cgit_diff_tree(const unsigned char *old_sha1,
441 const unsigned char *new_sha1, 472 const unsigned char *new_sha1,
442 filepair_fn fn, const char *prefix) 473 filepair_fn fn, const char *prefix)
443{ 474{
444 struct diff_options opt; 475 struct diff_options opt;
445 int ret; 476 int ret;
446 int prefixlen; 477 int prefixlen;
447 478
448 diff_setup(&opt); 479 diff_setup(&opt);
449 opt.output_format = DIFF_FORMAT_CALLBACK; 480 opt.output_format = DIFF_FORMAT_CALLBACK;
450 opt.detect_rename = 1; 481 opt.detect_rename = 1;
451 opt.rename_limit = cgit_renamelimit; 482 opt.rename_limit = cgit_renamelimit;
452 opt.recursive = 1; 483 opt.recursive = 1;
453 opt.format_callback = cgit_diff_tree_cb; 484 opt.format_callback = cgit_diff_tree_cb;
454 opt.format_callback_data = fn; 485 opt.format_callback_data = fn;
455 if (prefix) { 486 if (prefix) {
456 opt.nr_paths = 1; 487 opt.nr_paths = 1;
457 opt.paths = &prefix; 488 opt.paths = &prefix;
458 prefixlen = strlen(prefix); 489 prefixlen = strlen(prefix);
459 opt.pathlens = &prefixlen; 490 opt.pathlens = &prefixlen;
460 } 491 }
461 diff_setup_done(&opt); 492 diff_setup_done(&opt);
462 493
463 if (old_sha1 && !is_null_sha1(old_sha1)) 494 if (old_sha1 && !is_null_sha1(old_sha1))
464 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 495 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
465 else 496 else
466 ret = diff_root_tree_sha1(new_sha1, "", &opt); 497 ret = diff_root_tree_sha1(new_sha1, "", &opt);
467 diffcore_std(&opt); 498 diffcore_std(&opt);
468 diff_flush(&opt); 499 diff_flush(&opt);
469} 500}
470 501
471void cgit_diff_commit(struct commit *commit, filepair_fn fn) 502void cgit_diff_commit(struct commit *commit, filepair_fn fn)
472{ 503{
473 unsigned char *old_sha1 = NULL; 504 unsigned char *old_sha1 = NULL;
474 505
475 if (commit->parents) 506 if (commit->parents)
476 old_sha1 = commit->parents->item->object.sha1; 507 old_sha1 = commit->parents->item->object.sha1;
477 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); 508 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
478} 509}