summaryrefslogtreecommitdiffabout
path: root/shared.c
authorLars Hjemli <hjemli@gmail.com>2007-05-17 22:47:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-18 20:51:01 (UTC)
commit305414df1246531baf0f2c959c2c61df4e93c526 (patch) (unidiff)
tree18f071e269f01b875fd0045723faab30345d93ae /shared.c
parent08cc2e5f0e24773dad81d38bd6b689e36afe9dda (diff)
downloadcgit-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>
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-rw-r--r--shared.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 53cd9b0..b164d81 100644
--- a/shared.c
+++ b/shared.c
@@ -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
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
54int chk_zero(int result, char *msg) 54int 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
61int chk_positive(int result, char *msg) 61int 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
68struct repoinfo *add_repo(const char *url) 68struct 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
96struct 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
96void cgit_global_config_cb(const char *name, const char *value) 109void 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
158void cgit_querystring_cb(const char *name, const char *value) 171void 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
184void *cgit_free_commitinfo(struct commitinfo *info) 197void *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
195int hextoint(char c) 208int 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
207void cgit_diff_tree_cb(struct diff_queue_struct *q, 220void 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
219static int load_mmfile(mmfile_t *file, const unsigned char *sha1) 232static 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 */
240char *diffbuf = NULL; 253char *diffbuf = NULL;
241int buflen = 0; 254int buflen = 0;
242 255
243int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) 256int 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
277int cgit_diff_files(const unsigned char *old_sha1, 290int 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
298void cgit_diff_tree(const unsigned char *old_sha1, 311void 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
321void cgit_diff_commit(struct commit *commit, filepair_fn fn) 334void 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}