author | Michael Krelin <hacker@klever.net> | 2008-06-24 21:42:32 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-06-24 21:42:32 (UTC) |
commit | 42effc939090b2fbf1b2b76cd1d9c30fabcd230e (patch) (unidiff) | |
tree | ba75a2bc400a2a1dab6417b33b97a0d020fabf0f /ui-blob.c | |
parent | 01d2dce7e73e3f022d186de27dd5d15574144ca8 (diff) | |
download | cgit-42effc939090b2fbf1b2b76cd1d9c30fabcd230e.zip cgit-42effc939090b2fbf1b2b76cd1d9c30fabcd230e.tar.gz cgit-42effc939090b2fbf1b2b76cd1d9c30fabcd230e.tar.bz2 |
allow specification of directly linked blobs mimetypes
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | ui-blob.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,72 +1,72 @@ | |||
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, const char *pathname, unsigned mode, int stage) { | 16 | static int walk_tree(const unsigned char *sha1, const char *base,int baselen, const char *pathname, unsigned mode, int stage) { |
17 | if(strncmp(base,match_path,baselen) | 17 | if(strncmp(base,match_path,baselen) |
18 | || strcmp(match_path+baselen,pathname) ) | 18 | || strcmp(match_path+baselen,pathname) ) |
19 | return READ_TREE_RECURSIVE; | 19 | return READ_TREE_RECURSIVE; |
20 | memmove(matched_sha1,sha1,20); | 20 | memmove(matched_sha1,sha1,20); |
21 | return 0; | 21 | return 0; |
22 | } | 22 | } |
23 | 23 | ||
24 | void cgit_print_blob(const char *hex, char *path, const char *head) | 24 | void cgit_print_blob(const char *hex, char *path, const char *head) |
25 | { | 25 | { |
26 | 26 | ||
27 | unsigned char sha1[20]; | 27 | unsigned char sha1[20]; |
28 | enum object_type type; | 28 | enum object_type type; |
29 | unsigned char *buf; | 29 | unsigned char *buf; |
30 | unsigned long size; | 30 | unsigned long size; |
31 | struct commit *commit; | 31 | struct commit *commit; |
32 | const char *paths[] = {path, NULL}; | 32 | const char *paths[] = {path, NULL}; |
33 | 33 | ||
34 | if (hex) { | 34 | if (hex) { |
35 | if (get_sha1_hex(hex, sha1)){ | 35 | if (get_sha1_hex(hex, sha1)){ |
36 | cgit_print_error(fmt("Bad hex value: %s", hex)); | 36 | cgit_print_error(fmt("Bad hex value: %s", hex)); |
37 | return; | 37 | return; |
38 | } | 38 | } |
39 | } else { | 39 | } else { |
40 | if (get_sha1(head,sha1)) { | 40 | if (get_sha1(head,sha1)) { |
41 | cgit_print_error(fmt("Bad ref: %s", head)); | 41 | cgit_print_error(fmt("Bad ref: %s", head)); |
42 | return; | 42 | return; |
43 | } | 43 | } |
44 | } | 44 | } |
45 | 45 | ||
46 | type = sha1_object_info(sha1, &size); | 46 | type = sha1_object_info(sha1, &size); |
47 | 47 | ||
48 | if((!hex) && type == OBJ_COMMIT && path) { | 48 | if((!hex) && type == OBJ_COMMIT && path) { |
49 | commit = lookup_commit_reference(sha1); | 49 | commit = lookup_commit_reference(sha1); |
50 | match_path = path; | 50 | match_path = path; |
51 | matched_sha1 = sha1; | 51 | matched_sha1 = sha1; |
52 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); | 52 | read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree); |
53 | type = sha1_object_info(sha1,&size); | 53 | type = sha1_object_info(sha1,&size); |
54 | } | 54 | } |
55 | 55 | ||
56 | if (type == OBJ_BAD) { | 56 | if (type == OBJ_BAD) { |
57 | cgit_print_error(fmt("Bad object name: %s", hex)); | 57 | cgit_print_error(fmt("Bad object name: %s", hex)); |
58 | return; | 58 | return; |
59 | } | 59 | } |
60 | 60 | ||
61 | buf = read_sha1_file(sha1, &type, &size); | 61 | buf = read_sha1_file(sha1, &type, &size); |
62 | if (!buf) { | 62 | if (!buf) { |
63 | cgit_print_error(fmt("Error reading object %s", hex)); | 63 | cgit_print_error(fmt("Error reading object %s", hex)); |
64 | return; | 64 | return; |
65 | } | 65 | } |
66 | 66 | ||
67 | buf[size] = '\0'; | 67 | buf[size] = '\0'; |
68 | ctx.page.mimetype = NULL; | 68 | ctx.page.mimetype = ctx.qry.mimetype; |
69 | ctx.page.filename = path; | 69 | ctx.page.filename = path; |
70 | cgit_print_http_headers(&ctx); | 70 | cgit_print_http_headers(&ctx); |
71 | write(htmlfd, buf, size); | 71 | write(htmlfd, buf, size); |
72 | } | 72 | } |