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