|
diff --git a/shared.c b/shared.c index 19d2df0..f8a17b6 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -102,96 +102,139 @@ void cgit_global_config_cb(const char *name, const char *value) |
102 | cgit_logo_link = xstrdup(value); |
102 | cgit_logo_link = xstrdup(value); |
103 | else if (!strcmp(name, "module-link")) |
103 | else if (!strcmp(name, "module-link")) |
104 | cgit_module_link = xstrdup(value); |
104 | cgit_module_link = xstrdup(value); |
105 | else if (!strcmp(name, "virtual-root")) |
105 | else if (!strcmp(name, "virtual-root")) |
106 | cgit_virtual_root = xstrdup(value); |
106 | cgit_virtual_root = xstrdup(value); |
107 | else if (!strcmp(name, "nocache")) |
107 | else if (!strcmp(name, "nocache")) |
108 | cgit_nocache = atoi(value); |
108 | cgit_nocache = atoi(value); |
109 | else if (!strcmp(name, "snapshots")) |
109 | else if (!strcmp(name, "snapshots")) |
110 | cgit_snapshots = atoi(value); |
110 | cgit_snapshots = atoi(value); |
111 | else if (!strcmp(name, "cache-root")) |
111 | else if (!strcmp(name, "cache-root")) |
112 | cgit_cache_root = xstrdup(value); |
112 | cgit_cache_root = xstrdup(value); |
113 | else if (!strcmp(name, "cache-root-ttl")) |
113 | else if (!strcmp(name, "cache-root-ttl")) |
114 | cgit_cache_root_ttl = atoi(value); |
114 | cgit_cache_root_ttl = atoi(value); |
115 | else if (!strcmp(name, "cache-repo-ttl")) |
115 | else if (!strcmp(name, "cache-repo-ttl")) |
116 | cgit_cache_repo_ttl = atoi(value); |
116 | cgit_cache_repo_ttl = atoi(value); |
117 | else if (!strcmp(name, "cache-static-ttl")) |
117 | else if (!strcmp(name, "cache-static-ttl")) |
118 | cgit_cache_static_ttl = atoi(value); |
118 | cgit_cache_static_ttl = atoi(value); |
119 | else if (!strcmp(name, "cache-dynamic-ttl")) |
119 | else if (!strcmp(name, "cache-dynamic-ttl")) |
120 | cgit_cache_dynamic_ttl = atoi(value); |
120 | cgit_cache_dynamic_ttl = atoi(value); |
121 | else if (!strcmp(name, "max-message-length")) |
121 | else if (!strcmp(name, "max-message-length")) |
122 | cgit_max_msg_len = atoi(value); |
122 | cgit_max_msg_len = atoi(value); |
123 | else if (!strcmp(name, "repo.url")) |
123 | else if (!strcmp(name, "repo.url")) |
124 | cgit_repo = add_repo(value); |
124 | cgit_repo = add_repo(value); |
125 | else if (!strcmp(name, "repo.name")) |
125 | else if (!strcmp(name, "repo.name")) |
126 | cgit_repo->name = xstrdup(value); |
126 | cgit_repo->name = xstrdup(value); |
127 | else if (cgit_repo && !strcmp(name, "repo.path")) |
127 | else if (cgit_repo && !strcmp(name, "repo.path")) |
128 | cgit_repo->path = xstrdup(value); |
128 | cgit_repo->path = xstrdup(value); |
129 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
129 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
130 | cgit_repo->desc = xstrdup(value); |
130 | cgit_repo->desc = xstrdup(value); |
131 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
131 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
132 | cgit_repo->owner = xstrdup(value); |
132 | cgit_repo->owner = xstrdup(value); |
133 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
133 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
134 | cgit_repo->snapshots = atoi(value); |
134 | cgit_repo->snapshots = atoi(value); |
135 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
135 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
136 | cgit_repo->module_link= xstrdup(value); |
136 | cgit_repo->module_link= xstrdup(value); |
137 | } |
137 | } |
138 | |
138 | |
139 | void cgit_repo_config_cb(const char *name, const char *value) |
139 | void cgit_repo_config_cb(const char *name, const char *value) |
140 | { |
140 | { |
141 | if (!strcmp(name, "name")) |
141 | if (!strcmp(name, "name")) |
142 | cgit_repo_name = xstrdup(value); |
142 | cgit_repo_name = xstrdup(value); |
143 | else if (!strcmp(name, "desc")) |
143 | else if (!strcmp(name, "desc")) |
144 | cgit_repo_desc = xstrdup(value); |
144 | cgit_repo_desc = xstrdup(value); |
145 | else if (!strcmp(name, "owner")) |
145 | else if (!strcmp(name, "owner")) |
146 | cgit_repo_owner = xstrdup(value); |
146 | cgit_repo_owner = xstrdup(value); |
147 | } |
147 | } |
148 | |
148 | |
149 | void cgit_querystring_cb(const char *name, const char *value) |
149 | void cgit_querystring_cb(const char *name, const char *value) |
150 | { |
150 | { |
151 | if (!strcmp(name,"r")) { |
151 | if (!strcmp(name,"r")) { |
152 | cgit_query_repo = xstrdup(value); |
152 | cgit_query_repo = xstrdup(value); |
153 | } else if (!strcmp(name, "p")) { |
153 | } else if (!strcmp(name, "p")) { |
154 | cgit_query_page = xstrdup(value); |
154 | cgit_query_page = xstrdup(value); |
155 | } else if (!strcmp(name, "q")) { |
155 | } else if (!strcmp(name, "q")) { |
156 | cgit_query_search = xstrdup(value); |
156 | cgit_query_search = xstrdup(value); |
157 | } else if (!strcmp(name, "h")) { |
157 | } else if (!strcmp(name, "h")) { |
158 | cgit_query_head = xstrdup(value); |
158 | cgit_query_head = xstrdup(value); |
159 | cgit_query_has_symref = 1; |
159 | cgit_query_has_symref = 1; |
160 | } else if (!strcmp(name, "id")) { |
160 | } else if (!strcmp(name, "id")) { |
161 | cgit_query_sha1 = xstrdup(value); |
161 | cgit_query_sha1 = xstrdup(value); |
162 | cgit_query_has_sha1 = 1; |
162 | cgit_query_has_sha1 = 1; |
163 | } else if (!strcmp(name, "id2")) { |
163 | } else if (!strcmp(name, "id2")) { |
164 | cgit_query_sha2 = xstrdup(value); |
164 | cgit_query_sha2 = xstrdup(value); |
165 | cgit_query_has_sha1 = 1; |
165 | cgit_query_has_sha1 = 1; |
166 | } else if (!strcmp(name, "ofs")) { |
166 | } else if (!strcmp(name, "ofs")) { |
167 | cgit_query_ofs = atoi(value); |
167 | cgit_query_ofs = atoi(value); |
168 | } else if (!strcmp(name, "path")) { |
168 | } else if (!strcmp(name, "path")) { |
169 | cgit_query_path = xstrdup(value); |
169 | cgit_query_path = xstrdup(value); |
170 | } else if (!strcmp(name, "name")) { |
170 | } else if (!strcmp(name, "name")) { |
171 | cgit_query_name = xstrdup(value); |
171 | cgit_query_name = xstrdup(value); |
172 | } |
172 | } |
173 | } |
173 | } |
174 | |
174 | |
175 | void *cgit_free_commitinfo(struct commitinfo *info) |
175 | void *cgit_free_commitinfo(struct commitinfo *info) |
176 | { |
176 | { |
177 | free(info->author); |
177 | free(info->author); |
178 | free(info->author_email); |
178 | free(info->author_email); |
179 | free(info->committer); |
179 | free(info->committer); |
180 | free(info->committer_email); |
180 | free(info->committer_email); |
181 | free(info->subject); |
181 | free(info->subject); |
182 | free(info); |
182 | free(info); |
183 | return NULL; |
183 | return NULL; |
184 | } |
184 | } |
185 | |
185 | |
186 | int hextoint(char c) |
186 | int hextoint(char c) |
187 | { |
187 | { |
188 | if (c >= 'a' && c <= 'f') |
188 | if (c >= 'a' && c <= 'f') |
189 | return 10 + c - 'a'; |
189 | return 10 + c - 'a'; |
190 | else if (c >= 'A' && c <= 'F') |
190 | else if (c >= 'A' && c <= 'F') |
191 | return 10 + c - 'A'; |
191 | return 10 + c - 'A'; |
192 | else if (c >= '0' && c <= '9') |
192 | else if (c >= '0' && c <= '9') |
193 | return c - '0'; |
193 | return c - '0'; |
194 | else |
194 | else |
195 | return -1; |
195 | return -1; |
196 | } |
196 | } |
197 | |
197 | |
| |
198 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
| |
199 | struct diff_options *options, void *data) |
| |
200 | { |
| |
201 | int i; |
| |
202 | |
| |
203 | for (i = 0; i < q->nr; i++) { |
| |
204 | if (q->queue[i]->status == 'U') |
| |
205 | continue; |
| |
206 | ((filepair_fn)data)(q->queue[i]); |
| |
207 | } |
| |
208 | } |
| |
209 | |
| |
210 | void cgit_diff_tree(const unsigned char *old_sha1, |
| |
211 | const unsigned char *new_sha1, |
| |
212 | filepair_fn fn) |
| |
213 | { |
| |
214 | struct diff_options opt; |
| |
215 | int ret; |
| |
216 | |
| |
217 | diff_setup(&opt); |
| |
218 | opt.output_format = DIFF_FORMAT_CALLBACK; |
| |
219 | opt.detect_rename = 1; |
| |
220 | opt.recursive = 1; |
| |
221 | opt.format_callback = cgit_diff_tree_cb; |
| |
222 | opt.format_callback_data = fn; |
| |
223 | diff_setup_done(&opt); |
| |
224 | |
| |
225 | if (old_sha1) |
| |
226 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
| |
227 | else |
| |
228 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
| |
229 | diffcore_std(&opt); |
| |
230 | diff_flush(&opt); |
| |
231 | } |
| |
232 | |
| |
233 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
| |
234 | { |
| |
235 | unsigned char *old_sha1 = NULL; |
| |
236 | |
| |
237 | if (commit->parents) |
| |
238 | old_sha1 = commit->parents->item->object.sha1; |
| |
239 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); |
| |
240 | } |
|