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