author | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 17:00:05 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 17:00:05 (UTC) |
commit | a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806 (patch) (unidiff) | |
tree | de8271ebfabd244437cd68021c8af86391afb9bd /ui-blob.c | |
parent | 536c7a1eb201b44b9266babe087cb6f2b75e4a7f (diff) | |
parent | d187b98557d91b874836f286b955ba76ab26fb02 (diff) | |
download | cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.zip cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.gz cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.bz2 |
Merge branch 'ml/bugfix'
-rw-r--r-- | ui-blob.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -47,17 +47,17 @@ int cgit_print_file(char *path, const char *head) | |||
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; |
@@ -103,10 +103,10 @@ void cgit_print_blob(const char *hex, char *path, const char *head) | |||
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 | } |