author | Mark Lodato <lodatom@gmail.com> | 2010-09-04 18:18:16 (UTC) |
---|---|---|
committer | Mark Lodato <lodatom@gmail.com> | 2010-09-04 18:30:10 (UTC) |
commit | d187b98557d91b874836f286b955ba76ab26fb02 (patch) (unidiff) | |
tree | b8cf6224768c70c69450a7f6643393e342786594 /ui-blob.c | |
parent | 25e8ba1996a7b5ea291c924b0990d706176f6fe6 (diff) | |
download | cgit-d187b98557d91b874836f286b955ba76ab26fb02.zip cgit-d187b98557d91b874836f286b955ba76ab26fb02.tar.gz cgit-d187b98557d91b874836f286b955ba76ab26fb02.tar.bz2 |
prefer html_raw() to write()
To make the code more consistent, and to not rely on the implementation
of html(), always use html_raw(...) instead of write(htmlfd, ...).
Signed-off-by: Mark Lodato <lodatom@gmail.com>
-rw-r--r-- | ui-blob.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -43,25 +43,25 @@ int cgit_print_file(char *path, const char *head) | |||
43 | found_path = 0; | 43 | found_path = 0; |
44 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); | 44 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
45 | if (!found_path) | 45 | if (!found_path) |
46 | return -1; | 46 | return -1; |
47 | type = sha1_object_info(sha1, &size); | 47 | type = sha1_object_info(sha1, &size); |
48 | } | 48 | } |
49 | if (type == OBJ_BAD) | 49 | if (type == OBJ_BAD) |
50 | return -1; | 50 | return -1; |
51 | buf = read_sha1_file(sha1, &type, &size); | 51 | buf = read_sha1_file(sha1, &type, &size); |
52 | if (!buf) | 52 | if (!buf) |
53 | return -1; | 53 | return -1; |
54 | buf[size] = '\0'; | 54 | buf[size] = '\0'; |
55 | write(htmlfd, buf, size); | 55 | html_raw(buf, size); |
56 | return 0; | 56 | return 0; |
57 | } | 57 | } |
58 | 58 | ||
59 | void cgit_print_blob(const char *hex, char *path, const char *head) | 59 | void cgit_print_blob(const char *hex, char *path, const char *head) |
60 | { | 60 | { |
61 | unsigned char sha1[20]; | 61 | unsigned char sha1[20]; |
62 | enum object_type type; | 62 | enum object_type type; |
63 | char *buf; | 63 | char *buf; |
64 | unsigned long size; | 64 | unsigned long size; |
65 | struct commit *commit; | 65 | struct commit *commit; |
66 | const char *paths[] = {path, NULL}; | 66 | const char *paths[] = {path, NULL}; |
67 | 67 | ||
@@ -99,14 +99,14 @@ void cgit_print_blob(const char *hex, char *path, const char *head) | |||
99 | } | 99 | } |
100 | 100 | ||
101 | buf[size] = '\0'; | 101 | buf[size] = '\0'; |
102 | ctx.page.mimetype = ctx.qry.mimetype; | 102 | ctx.page.mimetype = ctx.qry.mimetype; |
103 | if (!ctx.page.mimetype) { | 103 | if (!ctx.page.mimetype) { |
104 | if (buffer_is_binary(buf, size)) | 104 | if (buffer_is_binary(buf, size)) |
105 | ctx.page.mimetype = "application/octet-stream"; | 105 | ctx.page.mimetype = "application/octet-stream"; |
106 | else | 106 | else |
107 | ctx.page.mimetype = "text/plain"; | 107 | ctx.page.mimetype = "text/plain"; |
108 | } | 108 | } |
109 | ctx.page.filename = path; | 109 | ctx.page.filename = path; |
110 | cgit_print_http_headers(&ctx); | 110 | cgit_print_http_headers(&ctx); |
111 | write(htmlfd, buf, size); | 111 | html_raw(buf, size); |
112 | } | 112 | } |