summaryrefslogtreecommitdiffabout
path: root/shared.c
Unidiff
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 65af11a..ce3ca4f 100644
--- a/shared.c
+++ b/shared.c
@@ -1,365 +1,368 @@
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
15char *cgit_root_title = "Git repository browser"; 15char *cgit_root_title = "Git repository browser";
16char *cgit_css = "/cgit.css"; 16char *cgit_css = "/cgit.css";
17char *cgit_logo = "/git-logo.png"; 17char *cgit_logo = "/git-logo.png";
18char *cgit_index_header = NULL; 18char *cgit_index_header = NULL;
19char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; 19char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
20char *cgit_module_link = "./?repo=%s&page=commit&id=%s"; 20char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
21char *cgit_agefile = "info/web/last-modified";
21char *cgit_virtual_root = NULL; 22char *cgit_virtual_root = NULL;
22char *cgit_script_name = CGIT_SCRIPT_NAME; 23char *cgit_script_name = CGIT_SCRIPT_NAME;
23char *cgit_cache_root = "/var/cache/cgit"; 24char *cgit_cache_root = "/var/cache/cgit";
24char *cgit_repo_group = NULL; 25char *cgit_repo_group = NULL;
25 26
26int cgit_nocache = 0; 27int cgit_nocache = 0;
27int cgit_snapshots = 0; 28int cgit_snapshots = 0;
28int cgit_enable_log_filecount = 0; 29int cgit_enable_log_filecount = 0;
29int cgit_enable_log_linecount = 0; 30int cgit_enable_log_linecount = 0;
30int cgit_max_lock_attempts = 5; 31int cgit_max_lock_attempts = 5;
31int cgit_cache_root_ttl = 5; 32int cgit_cache_root_ttl = 5;
32int cgit_cache_repo_ttl = 5; 33int cgit_cache_repo_ttl = 5;
33int cgit_cache_dynamic_ttl = 5; 34int cgit_cache_dynamic_ttl = 5;
34int cgit_cache_static_ttl = -1; 35int cgit_cache_static_ttl = -1;
35int cgit_cache_max_create_time = 5; 36int cgit_cache_max_create_time = 5;
36 37
37int cgit_max_msg_len = 60; 38int cgit_max_msg_len = 60;
38int cgit_max_repodesc_len = 60; 39int cgit_max_repodesc_len = 60;
39int cgit_max_commit_count = 50; 40int cgit_max_commit_count = 50;
40 41
41int cgit_query_has_symref = 0; 42int cgit_query_has_symref = 0;
42int cgit_query_has_sha1 = 0; 43int cgit_query_has_sha1 = 0;
43 44
44char *cgit_querystring = NULL; 45char *cgit_querystring = NULL;
45char *cgit_query_repo = NULL; 46char *cgit_query_repo = NULL;
46char *cgit_query_page = NULL; 47char *cgit_query_page = NULL;
47char *cgit_query_head = NULL; 48char *cgit_query_head = NULL;
48char *cgit_query_search = NULL; 49char *cgit_query_search = NULL;
49char *cgit_query_sha1 = NULL; 50char *cgit_query_sha1 = NULL;
50char *cgit_query_sha2 = NULL; 51char *cgit_query_sha2 = NULL;
51char *cgit_query_path = NULL; 52char *cgit_query_path = NULL;
52char *cgit_query_name = NULL; 53char *cgit_query_name = NULL;
53int cgit_query_ofs = 0; 54int cgit_query_ofs = 0;
54 55
55int htmlfd = 0; 56int htmlfd = 0;
56 57
57 58
58int cgit_get_cmd_index(const char *cmd) 59int cgit_get_cmd_index(const char *cmd)
59{ 60{
60 static char *cmds[] = {"log", "commit", "diff", "tree", "view", "blob", "snapshot", NULL}; 61 static char *cmds[] = {"log", "commit", "diff", "tree", "view", "blob", "snapshot", NULL};
61 int i; 62 int i;
62 63
63 for(i = 0; cmds[i]; i++) 64 for(i = 0; cmds[i]; i++)
64 if (!strcmp(cmd, cmds[i])) 65 if (!strcmp(cmd, cmds[i]))
65 return i + 1; 66 return i + 1;
66 return 0; 67 return 0;
67} 68}
68 69
69int chk_zero(int result, char *msg) 70int chk_zero(int result, char *msg)
70{ 71{
71 if (result != 0) 72 if (result != 0)
72 die("%s: %s", msg, strerror(errno)); 73 die("%s: %s", msg, strerror(errno));
73 return result; 74 return result;
74} 75}
75 76
76int chk_positive(int result, char *msg) 77int chk_positive(int result, char *msg)
77{ 78{
78 if (result <= 0) 79 if (result <= 0)
79 die("%s: %s", msg, strerror(errno)); 80 die("%s: %s", msg, strerror(errno));
80 return result; 81 return result;
81} 82}
82 83
83struct repoinfo *add_repo(const char *url) 84struct repoinfo *add_repo(const char *url)
84{ 85{
85 struct repoinfo *ret; 86 struct repoinfo *ret;
86 87
87 if (++cgit_repolist.count > cgit_repolist.length) { 88 if (++cgit_repolist.count > cgit_repolist.length) {
88 if (cgit_repolist.length == 0) 89 if (cgit_repolist.length == 0)
89 cgit_repolist.length = 8; 90 cgit_repolist.length = 8;
90 else 91 else
91 cgit_repolist.length *= 2; 92 cgit_repolist.length *= 2;
92 cgit_repolist.repos = xrealloc(cgit_repolist.repos, 93 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
93 cgit_repolist.length * 94 cgit_repolist.length *
94 sizeof(struct repoinfo)); 95 sizeof(struct repoinfo));
95 } 96 }
96 97
97 ret = &cgit_repolist.repos[cgit_repolist.count-1]; 98 ret = &cgit_repolist.repos[cgit_repolist.count-1];
98 ret->url = xstrdup(url); 99 ret->url = xstrdup(url);
99 ret->name = ret->url; 100 ret->name = ret->url;
100 ret->path = NULL; 101 ret->path = NULL;
101 ret->desc = NULL; 102 ret->desc = NULL;
102 ret->owner = NULL; 103 ret->owner = NULL;
103 ret->group = cgit_repo_group; 104 ret->group = cgit_repo_group;
104 ret->defbranch = "master"; 105 ret->defbranch = "master";
105 ret->snapshots = cgit_snapshots; 106 ret->snapshots = cgit_snapshots;
106 ret->enable_log_filecount = cgit_enable_log_filecount; 107 ret->enable_log_filecount = cgit_enable_log_filecount;
107 ret->enable_log_linecount = cgit_enable_log_linecount; 108 ret->enable_log_linecount = cgit_enable_log_linecount;
108 ret->module_link = cgit_module_link; 109 ret->module_link = cgit_module_link;
109 return ret; 110 return ret;
110} 111}
111 112
112struct repoinfo *cgit_get_repoinfo(const char *url) 113struct repoinfo *cgit_get_repoinfo(const char *url)
113{ 114{
114 int i; 115 int i;
115 struct repoinfo *repo; 116 struct repoinfo *repo;
116 117
117 for (i=0; i<cgit_repolist.count; i++) { 118 for (i=0; i<cgit_repolist.count; i++) {
118 repo = &cgit_repolist.repos[i]; 119 repo = &cgit_repolist.repos[i];
119 if (!strcmp(repo->url, url)) 120 if (!strcmp(repo->url, url))
120 return repo; 121 return repo;
121 } 122 }
122 return NULL; 123 return NULL;
123} 124}
124 125
125void cgit_global_config_cb(const char *name, const char *value) 126void cgit_global_config_cb(const char *name, const char *value)
126{ 127{
127 if (!strcmp(name, "root-title")) 128 if (!strcmp(name, "root-title"))
128 cgit_root_title = xstrdup(value); 129 cgit_root_title = xstrdup(value);
129 else if (!strcmp(name, "css")) 130 else if (!strcmp(name, "css"))
130 cgit_css = xstrdup(value); 131 cgit_css = xstrdup(value);
131 else if (!strcmp(name, "logo")) 132 else if (!strcmp(name, "logo"))
132 cgit_logo = xstrdup(value); 133 cgit_logo = xstrdup(value);
133 else if (!strcmp(name, "index-header")) 134 else if (!strcmp(name, "index-header"))
134 cgit_index_header = xstrdup(value); 135 cgit_index_header = xstrdup(value);
135 else if (!strcmp(name, "logo-link")) 136 else if (!strcmp(name, "logo-link"))
136 cgit_logo_link = xstrdup(value); 137 cgit_logo_link = xstrdup(value);
137 else if (!strcmp(name, "module-link")) 138 else if (!strcmp(name, "module-link"))
138 cgit_module_link = xstrdup(value); 139 cgit_module_link = xstrdup(value);
139 else if (!strcmp(name, "virtual-root")) 140 else if (!strcmp(name, "virtual-root"))
140 cgit_virtual_root = xstrdup(value); 141 cgit_virtual_root = xstrdup(value);
141 else if (!strcmp(name, "nocache")) 142 else if (!strcmp(name, "nocache"))
142 cgit_nocache = atoi(value); 143 cgit_nocache = atoi(value);
143 else if (!strcmp(name, "snapshots")) 144 else if (!strcmp(name, "snapshots"))
144 cgit_snapshots = atoi(value); 145 cgit_snapshots = atoi(value);
145 else if (!strcmp(name, "enable-log-filecount")) 146 else if (!strcmp(name, "enable-log-filecount"))
146 cgit_enable_log_filecount = atoi(value); 147 cgit_enable_log_filecount = atoi(value);
147 else if (!strcmp(name, "enable-log-linecount")) 148 else if (!strcmp(name, "enable-log-linecount"))
148 cgit_enable_log_linecount = atoi(value); 149 cgit_enable_log_linecount = atoi(value);
149 else if (!strcmp(name, "cache-root")) 150 else if (!strcmp(name, "cache-root"))
150 cgit_cache_root = xstrdup(value); 151 cgit_cache_root = xstrdup(value);
151 else if (!strcmp(name, "cache-root-ttl")) 152 else if (!strcmp(name, "cache-root-ttl"))
152 cgit_cache_root_ttl = atoi(value); 153 cgit_cache_root_ttl = atoi(value);
153 else if (!strcmp(name, "cache-repo-ttl")) 154 else if (!strcmp(name, "cache-repo-ttl"))
154 cgit_cache_repo_ttl = atoi(value); 155 cgit_cache_repo_ttl = atoi(value);
155 else if (!strcmp(name, "cache-static-ttl")) 156 else if (!strcmp(name, "cache-static-ttl"))
156 cgit_cache_static_ttl = atoi(value); 157 cgit_cache_static_ttl = atoi(value);
157 else if (!strcmp(name, "cache-dynamic-ttl")) 158 else if (!strcmp(name, "cache-dynamic-ttl"))
158 cgit_cache_dynamic_ttl = atoi(value); 159 cgit_cache_dynamic_ttl = atoi(value);
159 else if (!strcmp(name, "max-message-length")) 160 else if (!strcmp(name, "max-message-length"))
160 cgit_max_msg_len = atoi(value); 161 cgit_max_msg_len = atoi(value);
161 else if (!strcmp(name, "max-repodesc-length")) 162 else if (!strcmp(name, "max-repodesc-length"))
162 cgit_max_repodesc_len = atoi(value); 163 cgit_max_repodesc_len = atoi(value);
163 else if (!strcmp(name, "max-commit-count")) 164 else if (!strcmp(name, "max-commit-count"))
164 cgit_max_commit_count = atoi(value); 165 cgit_max_commit_count = atoi(value);
166 else if (!strcmp(name, "agefile"))
167 cgit_agefile = xstrdup(value);
165 else if (!strcmp(name, "repo.group")) 168 else if (!strcmp(name, "repo.group"))
166 cgit_repo_group = xstrdup(value); 169 cgit_repo_group = xstrdup(value);
167 else if (!strcmp(name, "repo.url")) 170 else if (!strcmp(name, "repo.url"))
168 cgit_repo = add_repo(value); 171 cgit_repo = add_repo(value);
169 else if (!strcmp(name, "repo.name")) 172 else if (!strcmp(name, "repo.name"))
170 cgit_repo->name = xstrdup(value); 173 cgit_repo->name = xstrdup(value);
171 else if (cgit_repo && !strcmp(name, "repo.path")) 174 else if (cgit_repo && !strcmp(name, "repo.path"))
172 cgit_repo->path = xstrdup(value); 175 cgit_repo->path = xstrdup(value);
173 else if (cgit_repo && !strcmp(name, "repo.desc")) 176 else if (cgit_repo && !strcmp(name, "repo.desc"))
174 cgit_repo->desc = xstrdup(value); 177 cgit_repo->desc = xstrdup(value);
175 else if (cgit_repo && !strcmp(name, "repo.owner")) 178 else if (cgit_repo && !strcmp(name, "repo.owner"))
176 cgit_repo->owner = xstrdup(value); 179 cgit_repo->owner = xstrdup(value);
177 else if (cgit_repo && !strcmp(name, "repo.defbranch")) 180 else if (cgit_repo && !strcmp(name, "repo.defbranch"))
178 cgit_repo->defbranch = xstrdup(value); 181 cgit_repo->defbranch = xstrdup(value);
179 else if (cgit_repo && !strcmp(name, "repo.snapshots")) 182 else if (cgit_repo && !strcmp(name, "repo.snapshots"))
180 cgit_repo->snapshots = cgit_snapshots * atoi(value); 183 cgit_repo->snapshots = cgit_snapshots * atoi(value);
181 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) 184 else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount"))
182 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); 185 cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value);
183 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) 186 else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount"))
184 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); 187 cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value);
185 else if (cgit_repo && !strcmp(name, "repo.module-link")) 188 else if (cgit_repo && !strcmp(name, "repo.module-link"))
186 cgit_repo->module_link= xstrdup(value); 189 cgit_repo->module_link= xstrdup(value);
187 else if (!strcmp(name, "include")) 190 else if (!strcmp(name, "include"))
188 cgit_read_config(value, cgit_global_config_cb); 191 cgit_read_config(value, cgit_global_config_cb);
189} 192}
190 193
191void cgit_querystring_cb(const char *name, const char *value) 194void cgit_querystring_cb(const char *name, const char *value)
192{ 195{
193 if (!strcmp(name,"r")) { 196 if (!strcmp(name,"r")) {
194 cgit_query_repo = xstrdup(value); 197 cgit_query_repo = xstrdup(value);
195 cgit_repo = cgit_get_repoinfo(value); 198 cgit_repo = cgit_get_repoinfo(value);
196 } else if (!strcmp(name, "p")) { 199 } else if (!strcmp(name, "p")) {
197 cgit_query_page = xstrdup(value); 200 cgit_query_page = xstrdup(value);
198 cgit_cmd = cgit_get_cmd_index(value); 201 cgit_cmd = cgit_get_cmd_index(value);
199 } else if (!strcmp(name, "url")) { 202 } else if (!strcmp(name, "url")) {
200 cgit_parse_url(value); 203 cgit_parse_url(value);
201 } else if (!strcmp(name, "q")) { 204 } else if (!strcmp(name, "q")) {
202 cgit_query_search = xstrdup(value); 205 cgit_query_search = xstrdup(value);
203 } else if (!strcmp(name, "h")) { 206 } else if (!strcmp(name, "h")) {
204 cgit_query_head = xstrdup(value); 207 cgit_query_head = xstrdup(value);
205 cgit_query_has_symref = 1; 208 cgit_query_has_symref = 1;
206 } else if (!strcmp(name, "id")) { 209 } else if (!strcmp(name, "id")) {
207 cgit_query_sha1 = xstrdup(value); 210 cgit_query_sha1 = xstrdup(value);
208 cgit_query_has_sha1 = 1; 211 cgit_query_has_sha1 = 1;
209 } else if (!strcmp(name, "id2")) { 212 } else if (!strcmp(name, "id2")) {
210 cgit_query_sha2 = xstrdup(value); 213 cgit_query_sha2 = xstrdup(value);
211 cgit_query_has_sha1 = 1; 214 cgit_query_has_sha1 = 1;
212 } else if (!strcmp(name, "ofs")) { 215 } else if (!strcmp(name, "ofs")) {
213 cgit_query_ofs = atoi(value); 216 cgit_query_ofs = atoi(value);
214 } else if (!strcmp(name, "path")) { 217 } else if (!strcmp(name, "path")) {
215 cgit_query_path = xstrdup(value); 218 cgit_query_path = xstrdup(value);
216 } else if (!strcmp(name, "name")) { 219 } else if (!strcmp(name, "name")) {
217 cgit_query_name = xstrdup(value); 220 cgit_query_name = xstrdup(value);
218 } 221 }
219} 222}
220 223
221void *cgit_free_commitinfo(struct commitinfo *info) 224void *cgit_free_commitinfo(struct commitinfo *info)
222{ 225{
223 free(info->author); 226 free(info->author);
224 free(info->author_email); 227 free(info->author_email);
225 free(info->committer); 228 free(info->committer);
226 free(info->committer_email); 229 free(info->committer_email);
227 free(info->subject); 230 free(info->subject);
228 free(info); 231 free(info);
229 return NULL; 232 return NULL;
230} 233}
231 234
232int hextoint(char c) 235int hextoint(char c)
233{ 236{
234 if (c >= 'a' && c <= 'f') 237 if (c >= 'a' && c <= 'f')
235 return 10 + c - 'a'; 238 return 10 + c - 'a';
236 else if (c >= 'A' && c <= 'F') 239 else if (c >= 'A' && c <= 'F')
237 return 10 + c - 'A'; 240 return 10 + c - 'A';
238 else if (c >= '0' && c <= '9') 241 else if (c >= '0' && c <= '9')
239 return c - '0'; 242 return c - '0';
240 else 243 else
241 return -1; 244 return -1;
242} 245}
243 246
244void cgit_diff_tree_cb(struct diff_queue_struct *q, 247void cgit_diff_tree_cb(struct diff_queue_struct *q,
245 struct diff_options *options, void *data) 248 struct diff_options *options, void *data)
246{ 249{
247 int i; 250 int i;
248 251
249 for (i = 0; i < q->nr; i++) { 252 for (i = 0; i < q->nr; i++) {
250 if (q->queue[i]->status == 'U') 253 if (q->queue[i]->status == 'U')
251 continue; 254 continue;
252 ((filepair_fn)data)(q->queue[i]); 255 ((filepair_fn)data)(q->queue[i]);
253 } 256 }
254} 257}
255 258
256static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 259static int load_mmfile(mmfile_t *file, const unsigned char *sha1)
257{ 260{
258 enum object_type type; 261 enum object_type type;
259 262
260 if (is_null_sha1(sha1)) { 263 if (is_null_sha1(sha1)) {
261 file->ptr = (char *)""; 264 file->ptr = (char *)"";
262 file->size = 0; 265 file->size = 0;
263 } else { 266 } else {
264 file->ptr = read_sha1_file(sha1, &type, &file->size); 267 file->ptr = read_sha1_file(sha1, &type, &file->size);
265 } 268 }
266 return 1; 269 return 1;
267} 270}
268 271
269/* 272/*
270 * Receive diff-buffers from xdiff and concatenate them as 273 * Receive diff-buffers from xdiff and concatenate them as
271 * needed across multiple callbacks. 274 * needed across multiple callbacks.
272 * 275 *
273 * This is basically a copy of xdiff-interface.c/xdiff_outf(), 276 * This is basically a copy of xdiff-interface.c/xdiff_outf(),
274 * ripped from git and modified to use globals instead of 277 * ripped from git and modified to use globals instead of
275 * a special callback-struct. 278 * a special callback-struct.
276 */ 279 */
277char *diffbuf = NULL; 280char *diffbuf = NULL;
278int buflen = 0; 281int buflen = 0;
279 282
280int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 283int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
281{ 284{
282 int i; 285 int i;
283 286
284 for (i = 0; i < nbuf; i++) { 287 for (i = 0; i < nbuf; i++) {
285 if (mb[i].ptr[mb[i].size-1] != '\n') { 288 if (mb[i].ptr[mb[i].size-1] != '\n') {
286 /* Incomplete line */ 289 /* Incomplete line */
287 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 290 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
288 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 291 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
289 buflen += mb[i].size; 292 buflen += mb[i].size;
290 continue; 293 continue;
291 } 294 }
292 295
293 /* we have a complete line */ 296 /* we have a complete line */
294 if (!diffbuf) { 297 if (!diffbuf) {
295 ((linediff_fn)priv)(mb[i].ptr, mb[i].size); 298 ((linediff_fn)priv)(mb[i].ptr, mb[i].size);
296 continue; 299 continue;
297 } 300 }
298 diffbuf = xrealloc(diffbuf, buflen + mb[i].size); 301 diffbuf = xrealloc(diffbuf, buflen + mb[i].size);
299 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); 302 memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size);
300 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); 303 ((linediff_fn)priv)(diffbuf, buflen + mb[i].size);
301 free(diffbuf); 304 free(diffbuf);
302 diffbuf = NULL; 305 diffbuf = NULL;
303 buflen = 0; 306 buflen = 0;
304 } 307 }
305 if (diffbuf) { 308 if (diffbuf) {
306 ((linediff_fn)priv)(diffbuf, buflen); 309 ((linediff_fn)priv)(diffbuf, buflen);
307 free(diffbuf); 310 free(diffbuf);
308 diffbuf = NULL; 311 diffbuf = NULL;
309 buflen = 0; 312 buflen = 0;
310 } 313 }
311 return 0; 314 return 0;
312} 315}
313 316
314int cgit_diff_files(const unsigned char *old_sha1, 317int cgit_diff_files(const unsigned char *old_sha1,
315 const unsigned char *new_sha1, 318 const unsigned char *new_sha1,
316 linediff_fn fn) 319 linediff_fn fn)
317{ 320{
318 mmfile_t file1, file2; 321 mmfile_t file1, file2;
319 xpparam_t diff_params; 322 xpparam_t diff_params;
320 xdemitconf_t emit_params; 323 xdemitconf_t emit_params;
321 xdemitcb_t emit_cb; 324 xdemitcb_t emit_cb;
322 325
323 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) 326 if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1))
324 return 1; 327 return 1;
325 328
326 diff_params.flags = XDF_NEED_MINIMAL; 329 diff_params.flags = XDF_NEED_MINIMAL;
327 emit_params.ctxlen = 3; 330 emit_params.ctxlen = 3;
328 emit_params.flags = XDL_EMIT_FUNCNAMES; 331 emit_params.flags = XDL_EMIT_FUNCNAMES;
329 emit_cb.outf = filediff_cb; 332 emit_cb.outf = filediff_cb;
330 emit_cb.priv = fn; 333 emit_cb.priv = fn;
331 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 334 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
332 return 0; 335 return 0;
333} 336}
334 337
335void cgit_diff_tree(const unsigned char *old_sha1, 338void cgit_diff_tree(const unsigned char *old_sha1,
336 const unsigned char *new_sha1, 339 const unsigned char *new_sha1,
337 filepair_fn fn) 340 filepair_fn fn)
338{ 341{
339 struct diff_options opt; 342 struct diff_options opt;
340 int ret; 343 int ret;
341 344
342 diff_setup(&opt); 345 diff_setup(&opt);
343 opt.output_format = DIFF_FORMAT_CALLBACK; 346 opt.output_format = DIFF_FORMAT_CALLBACK;
344 opt.detect_rename = 1; 347 opt.detect_rename = 1;
345 opt.recursive = 1; 348 opt.recursive = 1;
346 opt.format_callback = cgit_diff_tree_cb; 349 opt.format_callback = cgit_diff_tree_cb;
347 opt.format_callback_data = fn; 350 opt.format_callback_data = fn;
348 diff_setup_done(&opt); 351 diff_setup_done(&opt);
349 352
350 if (old_sha1) 353 if (old_sha1)
351 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 354 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
352 else 355 else
353 ret = diff_root_tree_sha1(new_sha1, "", &opt); 356 ret = diff_root_tree_sha1(new_sha1, "", &opt);
354 diffcore_std(&opt); 357 diffcore_std(&opt);
355 diff_flush(&opt); 358 diff_flush(&opt);
356} 359}
357 360
358void cgit_diff_commit(struct commit *commit, filepair_fn fn) 361void cgit_diff_commit(struct commit *commit, filepair_fn fn)
359{ 362{
360 unsigned char *old_sha1 = NULL; 363 unsigned char *old_sha1 = NULL;
361 364
362 if (commit->parents) 365 if (commit->parents)
363 old_sha1 = commit->parents->item->object.sha1; 366 old_sha1 = commit->parents->item->object.sha1;
364 cgit_diff_tree(old_sha1, commit->object.sha1, fn); 367 cgit_diff_tree(old_sha1, commit->object.sha1, fn);
365} 368}