author | Martins Polakovs <martins.polakovs@gmail.com> | 2009-12-10 15:35:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-12-12 10:56:25 (UTC) |
commit | 24538b072718924d3418a258cf0009fb5b5768de (patch) (unidiff) | |
tree | 54a2ea6fb82c5ff99f188624a24b7c5d54657095 /ui-blob.c | |
parent | f2bf0a05280edddb4961214adfd7b440191737e2 (diff) | |
download | cgit-24538b072718924d3418a258cf0009fb5b5768de.zip cgit-24538b072718924d3418a258cf0009fb5b5768de.tar.gz cgit-24538b072718924d3418a258cf0009fb5b5768de.tar.bz2 |
Fix segfault on ppc when browsing tree
-rw-r--r-- | ui-blob.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,79 +1,79 @@ | |||
1 | /* ui-blob.c: show blob content | 1 | /* ui-blob.c: show blob content |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 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 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
13 | static char *match_path; | 13 | static char *match_path; |
14 | static unsigned char *matched_sha1; | 14 | static unsigned char *matched_sha1; |
15 | 15 | ||
16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, | 16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, |
17 | const char *pathname, unsigned mode, int stage, void *cbdata) { | 17 | const char *pathname, unsigned mode, int stage, void *cbdata) { |
18 | if(strncmp(base,match_path,baselen) | 18 | if(strncmp(base,match_path,baselen) |
19 | || strcmp(match_path+baselen,pathname) ) | 19 | || strcmp(match_path+baselen,pathname) ) |
20 | return READ_TREE_RECURSIVE; | 20 | return READ_TREE_RECURSIVE; |
21 | memmove(matched_sha1,sha1,20); | 21 | memmove(matched_sha1,sha1,20); |
22 | return 0; | 22 | return 0; |
23 | } | 23 | } |
24 | 24 | ||
25 | void cgit_print_blob(const char *hex, char *path, const char *head) | 25 | void cgit_print_blob(const char *hex, char *path, const char *head) |
26 | { | 26 | { |
27 | 27 | ||
28 | unsigned char sha1[20]; | 28 | unsigned char sha1[20]; |
29 | enum object_type type; | 29 | enum object_type type; |
30 | char *buf; | 30 | char *buf; |
31 | unsigned long size; | 31 | unsigned long size; |
32 | struct commit *commit; | 32 | struct commit *commit; |
33 | const char *paths[] = {path, NULL}; | 33 | const char *paths[] = {path, NULL}; |
34 | 34 | ||
35 | if (hex) { | 35 | if (hex) { |
36 | if (get_sha1_hex(hex, sha1)){ | 36 | if (get_sha1_hex(hex, sha1)){ |
37 | cgit_print_error(fmt("Bad hex value: %s", hex)); | 37 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
38 | return; | 38 | return; |
39 | } | 39 | } |
40 | } else { | 40 | } else { |
41 | if (get_sha1(head,sha1)) { | 41 | if (get_sha1(head,sha1)) { |
42 | cgit_print_error(fmt("Bad ref: %s", head)); | 42 | cgit_print_error(fmt("Bad ref: %s", head)); |
43 | return; | 43 | return; |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | type = sha1_object_info(sha1, &size); | 47 | type = sha1_object_info(sha1, &size); |
48 | 48 | ||
49 | if((!hex) && type == OBJ_COMMIT && path) { | 49 | if((!hex) && type == OBJ_COMMIT && path) { |
50 | commit = lookup_commit_reference(sha1); | 50 | commit = lookup_commit_reference(sha1); |
51 | match_path = path; | 51 | match_path = path; |
52 | matched_sha1 = sha1; | 52 | matched_sha1 = sha1; |
53 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); | 53 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
54 | type = sha1_object_info(sha1,&size); | 54 | type = sha1_object_info(sha1,&size); |
55 | } | 55 | } |
56 | 56 | ||
57 | if (type == OBJ_BAD) { | 57 | if (type == OBJ_BAD) { |
58 | cgit_print_error(fmt("Bad object name: %s", hex)); | 58 | cgit_print_error(fmt("Bad object name: %s", hex)); |
59 | return; | 59 | return; |
60 | } | 60 | } |
61 | 61 | ||
62 | buf = read_sha1_file(sha1, &type, &size); | 62 | buf = read_sha1_file(sha1, &type, &size); |
63 | if (!buf) { | 63 | if (!buf) { |
64 | cgit_print_error(fmt("Error reading object %s", hex)); | 64 | cgit_print_error(fmt("Error reading object %s", hex)); |
65 | return; | 65 | return; |
66 | } | 66 | } |
67 | 67 | ||
68 | buf[size] = '\0'; | 68 | buf[size] = '\0'; |
69 | ctx.page.mimetype = ctx.qry.mimetype; | 69 | ctx.page.mimetype = ctx.qry.mimetype; |
70 | if (!ctx.page.mimetype) { | 70 | if (!ctx.page.mimetype) { |
71 | if (buffer_is_binary(buf, size)) | 71 | if (buffer_is_binary(buf, size)) |
72 | ctx.page.mimetype = "application/octet-stream"; | 72 | ctx.page.mimetype = "application/octet-stream"; |
73 | else | 73 | else |
74 | ctx.page.mimetype = "text/plain"; | 74 | ctx.page.mimetype = "text/plain"; |
75 | } | 75 | } |
76 | ctx.page.filename = path; | 76 | ctx.page.filename = path; |
77 | cgit_print_http_headers(&ctx); | 77 | cgit_print_http_headers(&ctx); |
78 | write(htmlfd, buf, size); | 78 | write(htmlfd, buf, size); |
79 | } | 79 | } |