author | Jonathan Bastien-Filiatrault <joe@x2a.org> | 2007-10-26 22:09:06 (UTC) |
---|---|---|
committer | Jonathan Bastien-Filiatrault <joe@x2a.org> | 2007-11-05 23:13:30 (UTC) |
commit | 3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b (patch) (unidiff) | |
tree | 548671b6339e9a1a252ded4d534f11bfcd560043 /shared.c | |
parent | 72ede12551af320b6d8eade853dbd2cd6f2222cc (diff) | |
download | cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.zip cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.gz cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.bz2 |
Add commit->msg_encoding, allocate msg dynamicly.
-rw-r--r-- | shared.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -140,256 +140,258 @@ struct repoinfo *cgit_get_repoinfo(const char *url) | |||
140 | } | 140 | } |
141 | return NULL; | 141 | return NULL; |
142 | } | 142 | } |
143 | 143 | ||
144 | void cgit_global_config_cb(const char *name, const char *value) | 144 | void cgit_global_config_cb(const char *name, const char *value) |
145 | { | 145 | { |
146 | if (!strcmp(name, "root-title")) | 146 | if (!strcmp(name, "root-title")) |
147 | cgit_root_title = xstrdup(value); | 147 | cgit_root_title = xstrdup(value); |
148 | else if (!strcmp(name, "css")) | 148 | else if (!strcmp(name, "css")) |
149 | cgit_css = xstrdup(value); | 149 | cgit_css = xstrdup(value); |
150 | else if (!strcmp(name, "logo")) | 150 | else if (!strcmp(name, "logo")) |
151 | cgit_logo = xstrdup(value); | 151 | cgit_logo = xstrdup(value); |
152 | else if (!strcmp(name, "index-header")) | 152 | else if (!strcmp(name, "index-header")) |
153 | cgit_index_header = xstrdup(value); | 153 | cgit_index_header = xstrdup(value); |
154 | else if (!strcmp(name, "index-info")) | 154 | else if (!strcmp(name, "index-info")) |
155 | cgit_index_info = xstrdup(value); | 155 | cgit_index_info = xstrdup(value); |
156 | else if (!strcmp(name, "logo-link")) | 156 | else if (!strcmp(name, "logo-link")) |
157 | cgit_logo_link = xstrdup(value); | 157 | cgit_logo_link = xstrdup(value); |
158 | else if (!strcmp(name, "module-link")) | 158 | else if (!strcmp(name, "module-link")) |
159 | cgit_module_link = xstrdup(value); | 159 | cgit_module_link = xstrdup(value); |
160 | else if (!strcmp(name, "virtual-root")) | 160 | else if (!strcmp(name, "virtual-root")) |
161 | cgit_virtual_root = trim_end(value, '/'); | 161 | cgit_virtual_root = trim_end(value, '/'); |
162 | else if (!strcmp(name, "nocache")) | 162 | else if (!strcmp(name, "nocache")) |
163 | cgit_nocache = atoi(value); | 163 | cgit_nocache = atoi(value); |
164 | else if (!strcmp(name, "snapshots")) | 164 | else if (!strcmp(name, "snapshots")) |
165 | cgit_snapshots = cgit_parse_snapshots_mask(value); | 165 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
166 | else if (!strcmp(name, "enable-index-links")) | 166 | else if (!strcmp(name, "enable-index-links")) |
167 | cgit_enable_index_links = atoi(value); | 167 | cgit_enable_index_links = atoi(value); |
168 | else if (!strcmp(name, "enable-log-filecount")) | 168 | else if (!strcmp(name, "enable-log-filecount")) |
169 | cgit_enable_log_filecount = atoi(value); | 169 | cgit_enable_log_filecount = atoi(value); |
170 | else if (!strcmp(name, "enable-log-linecount")) | 170 | else if (!strcmp(name, "enable-log-linecount")) |
171 | cgit_enable_log_linecount = atoi(value); | 171 | cgit_enable_log_linecount = atoi(value); |
172 | else if (!strcmp(name, "cache-root")) | 172 | else if (!strcmp(name, "cache-root")) |
173 | cgit_cache_root = xstrdup(value); | 173 | cgit_cache_root = xstrdup(value); |
174 | else if (!strcmp(name, "cache-root-ttl")) | 174 | else if (!strcmp(name, "cache-root-ttl")) |
175 | cgit_cache_root_ttl = atoi(value); | 175 | cgit_cache_root_ttl = atoi(value); |
176 | else if (!strcmp(name, "cache-repo-ttl")) | 176 | else if (!strcmp(name, "cache-repo-ttl")) |
177 | cgit_cache_repo_ttl = atoi(value); | 177 | cgit_cache_repo_ttl = atoi(value); |
178 | else if (!strcmp(name, "cache-static-ttl")) | 178 | else if (!strcmp(name, "cache-static-ttl")) |
179 | cgit_cache_static_ttl = atoi(value); | 179 | cgit_cache_static_ttl = atoi(value); |
180 | else if (!strcmp(name, "cache-dynamic-ttl")) | 180 | else if (!strcmp(name, "cache-dynamic-ttl")) |
181 | cgit_cache_dynamic_ttl = atoi(value); | 181 | cgit_cache_dynamic_ttl = atoi(value); |
182 | else if (!strcmp(name, "max-message-length")) | 182 | else if (!strcmp(name, "max-message-length")) |
183 | cgit_max_msg_len = atoi(value); | 183 | cgit_max_msg_len = atoi(value); |
184 | else if (!strcmp(name, "max-repodesc-length")) | 184 | else if (!strcmp(name, "max-repodesc-length")) |
185 | cgit_max_repodesc_len = atoi(value); | 185 | cgit_max_repodesc_len = atoi(value); |
186 | else if (!strcmp(name, "max-commit-count")) | 186 | else if (!strcmp(name, "max-commit-count")) |
187 | cgit_max_commit_count = atoi(value); | 187 | cgit_max_commit_count = atoi(value); |
188 | else if (!strcmp(name, "summary-log")) | 188 | else if (!strcmp(name, "summary-log")) |
189 | cgit_summary_log = atoi(value); | 189 | cgit_summary_log = atoi(value); |
190 | else if (!strcmp(name, "summary-branches")) | 190 | else if (!strcmp(name, "summary-branches")) |
191 | cgit_summary_branches = atoi(value); | 191 | cgit_summary_branches = atoi(value); |
192 | else if (!strcmp(name, "summary-tags")) | 192 | else if (!strcmp(name, "summary-tags")) |
193 | cgit_summary_tags = atoi(value); | 193 | cgit_summary_tags = atoi(value); |
194 | else if (!strcmp(name, "agefile")) | 194 | else if (!strcmp(name, "agefile")) |
195 | cgit_agefile = xstrdup(value); | 195 | cgit_agefile = xstrdup(value); |
196 | else if (!strcmp(name, "renamelimit")) | 196 | else if (!strcmp(name, "renamelimit")) |
197 | cgit_renamelimit = atoi(value); | 197 | cgit_renamelimit = atoi(value); |
198 | else if (!strcmp(name, "repo.group")) | 198 | else if (!strcmp(name, "repo.group")) |
199 | cgit_repo_group = xstrdup(value); | 199 | cgit_repo_group = xstrdup(value); |
200 | else if (!strcmp(name, "repo.url")) | 200 | else if (!strcmp(name, "repo.url")) |
201 | cgit_repo = add_repo(value); | 201 | cgit_repo = add_repo(value); |
202 | else if (!strcmp(name, "repo.name")) | 202 | else if (!strcmp(name, "repo.name")) |
203 | cgit_repo->name = xstrdup(value); | 203 | cgit_repo->name = xstrdup(value); |
204 | else if (cgit_repo && !strcmp(name, "repo.path")) | 204 | else if (cgit_repo && !strcmp(name, "repo.path")) |
205 | cgit_repo->path = trim_end(value, '/'); | 205 | cgit_repo->path = trim_end(value, '/'); |
206 | else if (cgit_repo && !strcmp(name, "repo.desc")) | 206 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
207 | cgit_repo->desc = xstrdup(value); | 207 | cgit_repo->desc = xstrdup(value); |
208 | else if (cgit_repo && !strcmp(name, "repo.owner")) | 208 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
209 | cgit_repo->owner = xstrdup(value); | 209 | cgit_repo->owner = xstrdup(value); |
210 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) | 210 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
211 | cgit_repo->defbranch = xstrdup(value); | 211 | cgit_repo->defbranch = xstrdup(value); |
212 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) | 212 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
213 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 213 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
214 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) | 214 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
215 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); | 215 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
216 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) | 216 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
217 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); | 217 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
218 | else if (cgit_repo && !strcmp(name, "repo.module-link")) | 218 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
219 | cgit_repo->module_link= xstrdup(value); | 219 | cgit_repo->module_link= xstrdup(value); |
220 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { | 220 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
221 | if (*value == '/') | 221 | if (*value == '/') |
222 | cgit_repo->readme = xstrdup(value); | 222 | cgit_repo->readme = xstrdup(value); |
223 | else | 223 | else |
224 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 224 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); |
225 | } else if (!strcmp(name, "include")) | 225 | } else if (!strcmp(name, "include")) |
226 | cgit_read_config(value, cgit_global_config_cb); | 226 | cgit_read_config(value, cgit_global_config_cb); |
227 | } | 227 | } |
228 | 228 | ||
229 | void cgit_querystring_cb(const char *name, const char *value) | 229 | void cgit_querystring_cb(const char *name, const char *value) |
230 | { | 230 | { |
231 | if (!strcmp(name,"r")) { | 231 | if (!strcmp(name,"r")) { |
232 | cgit_query_repo = xstrdup(value); | 232 | cgit_query_repo = xstrdup(value); |
233 | cgit_repo = cgit_get_repoinfo(value); | 233 | cgit_repo = cgit_get_repoinfo(value); |
234 | } else if (!strcmp(name, "p")) { | 234 | } else if (!strcmp(name, "p")) { |
235 | cgit_query_page = xstrdup(value); | 235 | cgit_query_page = xstrdup(value); |
236 | cgit_cmd = cgit_get_cmd_index(value); | 236 | cgit_cmd = cgit_get_cmd_index(value); |
237 | } else if (!strcmp(name, "url")) { | 237 | } else if (!strcmp(name, "url")) { |
238 | cgit_parse_url(value); | 238 | cgit_parse_url(value); |
239 | } else if (!strcmp(name, "qt")) { | 239 | } else if (!strcmp(name, "qt")) { |
240 | cgit_query_grep = xstrdup(value); | 240 | cgit_query_grep = xstrdup(value); |
241 | } else if (!strcmp(name, "q")) { | 241 | } else if (!strcmp(name, "q")) { |
242 | cgit_query_search = xstrdup(value); | 242 | cgit_query_search = xstrdup(value); |
243 | } else if (!strcmp(name, "h")) { | 243 | } else if (!strcmp(name, "h")) { |
244 | cgit_query_head = xstrdup(value); | 244 | cgit_query_head = xstrdup(value); |
245 | cgit_query_has_symref = 1; | 245 | cgit_query_has_symref = 1; |
246 | } else if (!strcmp(name, "id")) { | 246 | } else if (!strcmp(name, "id")) { |
247 | cgit_query_sha1 = xstrdup(value); | 247 | cgit_query_sha1 = xstrdup(value); |
248 | cgit_query_has_sha1 = 1; | 248 | cgit_query_has_sha1 = 1; |
249 | } else if (!strcmp(name, "id2")) { | 249 | } else if (!strcmp(name, "id2")) { |
250 | cgit_query_sha2 = xstrdup(value); | 250 | cgit_query_sha2 = xstrdup(value); |
251 | cgit_query_has_sha1 = 1; | 251 | cgit_query_has_sha1 = 1; |
252 | } else if (!strcmp(name, "ofs")) { | 252 | } else if (!strcmp(name, "ofs")) { |
253 | cgit_query_ofs = atoi(value); | 253 | cgit_query_ofs = atoi(value); |
254 | } else if (!strcmp(name, "path")) { | 254 | } else if (!strcmp(name, "path")) { |
255 | cgit_query_path = trim_end(value, '/'); | 255 | cgit_query_path = trim_end(value, '/'); |
256 | } else if (!strcmp(name, "name")) { | 256 | } else if (!strcmp(name, "name")) { |
257 | cgit_query_name = xstrdup(value); | 257 | cgit_query_name = xstrdup(value); |
258 | } | 258 | } |
259 | } | 259 | } |
260 | 260 | ||
261 | void *cgit_free_commitinfo(struct commitinfo *info) | 261 | void *cgit_free_commitinfo(struct commitinfo *info) |
262 | { | 262 | { |
263 | free(info->author); | 263 | free(info->author); |
264 | free(info->author_email); | 264 | free(info->author_email); |
265 | free(info->committer); | 265 | free(info->committer); |
266 | free(info->committer_email); | 266 | free(info->committer_email); |
267 | free(info->subject); | 267 | free(info->subject); |
268 | free(info->msg); | ||
269 | free(info->msg_encoding); | ||
268 | free(info); | 270 | free(info); |
269 | return NULL; | 271 | return NULL; |
270 | } | 272 | } |
271 | 273 | ||
272 | int hextoint(char c) | 274 | int hextoint(char c) |
273 | { | 275 | { |
274 | if (c >= 'a' && c <= 'f') | 276 | if (c >= 'a' && c <= 'f') |
275 | return 10 + c - 'a'; | 277 | return 10 + c - 'a'; |
276 | else if (c >= 'A' && c <= 'F') | 278 | else if (c >= 'A' && c <= 'F') |
277 | return 10 + c - 'A'; | 279 | return 10 + c - 'A'; |
278 | else if (c >= '0' && c <= '9') | 280 | else if (c >= '0' && c <= '9') |
279 | return c - '0'; | 281 | return c - '0'; |
280 | else | 282 | else |
281 | return -1; | 283 | return -1; |
282 | } | 284 | } |
283 | 285 | ||
284 | char *trim_end(const char *str, char c) | 286 | char *trim_end(const char *str, char c) |
285 | { | 287 | { |
286 | int len; | 288 | int len; |
287 | char *s, *t; | 289 | char *s, *t; |
288 | 290 | ||
289 | if (str == NULL) | 291 | if (str == NULL) |
290 | return NULL; | 292 | return NULL; |
291 | t = (char *)str; | 293 | t = (char *)str; |
292 | len = strlen(t); | 294 | len = strlen(t); |
293 | while(len > 0 && t[len - 1] == c) | 295 | while(len > 0 && t[len - 1] == c) |
294 | len--; | 296 | len--; |
295 | 297 | ||
296 | if (len == 0) | 298 | if (len == 0) |
297 | return NULL; | 299 | return NULL; |
298 | 300 | ||
299 | c = t[len]; | 301 | c = t[len]; |
300 | t[len] = '\0'; | 302 | t[len] = '\0'; |
301 | s = xstrdup(t); | 303 | s = xstrdup(t); |
302 | t[len] = c; | 304 | t[len] = c; |
303 | return s; | 305 | return s; |
304 | } | 306 | } |
305 | 307 | ||
306 | char *strlpart(char *txt, int maxlen) | 308 | char *strlpart(char *txt, int maxlen) |
307 | { | 309 | { |
308 | char *result; | 310 | char *result; |
309 | 311 | ||
310 | if (!txt) | 312 | if (!txt) |
311 | return txt; | 313 | return txt; |
312 | 314 | ||
313 | if (strlen(txt) <= maxlen) | 315 | if (strlen(txt) <= maxlen) |
314 | return txt; | 316 | return txt; |
315 | result = xmalloc(maxlen + 1); | 317 | result = xmalloc(maxlen + 1); |
316 | memcpy(result, txt, maxlen - 3); | 318 | memcpy(result, txt, maxlen - 3); |
317 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; | 319 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
318 | result[maxlen] = '\0'; | 320 | result[maxlen] = '\0'; |
319 | return result; | 321 | return result; |
320 | } | 322 | } |
321 | 323 | ||
322 | char *strrpart(char *txt, int maxlen) | 324 | char *strrpart(char *txt, int maxlen) |
323 | { | 325 | { |
324 | char *result; | 326 | char *result; |
325 | 327 | ||
326 | if (!txt) | 328 | if (!txt) |
327 | return txt; | 329 | return txt; |
328 | 330 | ||
329 | if (strlen(txt) <= maxlen) | 331 | if (strlen(txt) <= maxlen) |
330 | return txt; | 332 | return txt; |
331 | result = xmalloc(maxlen + 1); | 333 | result = xmalloc(maxlen + 1); |
332 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); | 334 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
333 | result[0] = result[1] = result[2] = '.'; | 335 | result[0] = result[1] = result[2] = '.'; |
334 | return result; | 336 | return result; |
335 | } | 337 | } |
336 | 338 | ||
337 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 339 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
338 | { | 340 | { |
339 | size_t size; | 341 | size_t size; |
340 | 342 | ||
341 | if (list->count >= list->alloc) { | 343 | if (list->count >= list->alloc) { |
342 | list->alloc += (list->alloc ? list->alloc : 4); | 344 | list->alloc += (list->alloc ? list->alloc : 4); |
343 | size = list->alloc * sizeof(struct refinfo *); | 345 | size = list->alloc * sizeof(struct refinfo *); |
344 | list->refs = xrealloc(list->refs, size); | 346 | list->refs = xrealloc(list->refs, size); |
345 | } | 347 | } |
346 | list->refs[list->count++] = ref; | 348 | list->refs[list->count++] = ref; |
347 | } | 349 | } |
348 | 350 | ||
349 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) | 351 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
350 | { | 352 | { |
351 | struct refinfo *ref; | 353 | struct refinfo *ref; |
352 | 354 | ||
353 | ref = xmalloc(sizeof (struct refinfo)); | 355 | ref = xmalloc(sizeof (struct refinfo)); |
354 | ref->refname = xstrdup(refname); | 356 | ref->refname = xstrdup(refname); |
355 | ref->object = parse_object(sha1); | 357 | ref->object = parse_object(sha1); |
356 | switch (ref->object->type) { | 358 | switch (ref->object->type) { |
357 | case OBJ_TAG: | 359 | case OBJ_TAG: |
358 | ref->tag = cgit_parse_tag((struct tag *)ref->object); | 360 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
359 | break; | 361 | break; |
360 | case OBJ_COMMIT: | 362 | case OBJ_COMMIT: |
361 | ref->commit = cgit_parse_commit((struct commit *)ref->object); | 363 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
362 | break; | 364 | break; |
363 | } | 365 | } |
364 | return ref; | 366 | return ref; |
365 | } | 367 | } |
366 | 368 | ||
367 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, | 369 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
368 | void *cb_data) | 370 | void *cb_data) |
369 | { | 371 | { |
370 | struct reflist *list = (struct reflist *)cb_data; | 372 | struct reflist *list = (struct reflist *)cb_data; |
371 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); | 373 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
372 | 374 | ||
373 | if (info) | 375 | if (info) |
374 | cgit_add_ref(list, info); | 376 | cgit_add_ref(list, info); |
375 | return 0; | 377 | return 0; |
376 | } | 378 | } |
377 | 379 | ||
378 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 380 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
379 | struct diff_options *options, void *data) | 381 | struct diff_options *options, void *data) |
380 | { | 382 | { |
381 | int i; | 383 | int i; |
382 | 384 | ||
383 | for (i = 0; i < q->nr; i++) { | 385 | for (i = 0; i < q->nr; i++) { |
384 | if (q->queue[i]->status == 'U') | 386 | if (q->queue[i]->status == 'U') |
385 | continue; | 387 | continue; |
386 | ((filepair_fn)data)(q->queue[i]); | 388 | ((filepair_fn)data)(q->queue[i]); |
387 | } | 389 | } |
388 | } | 390 | } |
389 | 391 | ||
390 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 392 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
391 | { | 393 | { |
392 | enum object_type type; | 394 | enum object_type type; |
393 | 395 | ||
394 | if (is_null_sha1(sha1)) { | 396 | if (is_null_sha1(sha1)) { |
395 | file->ptr = (char *)""; | 397 | file->ptr = (char *)""; |