summaryrefslogtreecommitdiffabout
path: root/ui-blob.c
Unidiff
Diffstat (limited to 'ui-blob.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-blob.c35
1 files changed, 34 insertions, 1 deletions
diff --git a/ui-blob.c b/ui-blob.c
index 89330ce..667a451 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,79 +1,112 @@
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 * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
4 * 5 *
5 * Licensed under GNU General Public License v2 6 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 7 * (see COPYING for full license text)
7 */ 8 */
8 9
9#include "cgit.h" 10#include "cgit.h"
10#include "html.h" 11#include "html.h"
11#include "ui-shared.h" 12#include "ui-shared.h"
12 13
13static char *match_path; 14static char *match_path;
14static unsigned char *matched_sha1; 15static unsigned char *matched_sha1;
16static int found_path;
15 17
16static int walk_tree(const unsigned char *sha1, const char *base,int baselen, 18static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
17 const char *pathname, unsigned mode, int stage, void *cbdata) { 19 const char *pathname, unsigned mode, int stage, void *cbdata) {
18 if(strncmp(base,match_path,baselen) 20 if(strncmp(base,match_path,baselen)
19 || strcmp(match_path+baselen,pathname) ) 21 || strcmp(match_path+baselen,pathname) )
20 return READ_TREE_RECURSIVE; 22 return READ_TREE_RECURSIVE;
21 memmove(matched_sha1,sha1,20); 23 memmove(matched_sha1,sha1,20);
24 found_path = 1;
22 return 0; 25 return 0;
23} 26}
24 27
25void cgit_print_blob(const char *hex, char *path, const char *head) 28int cgit_print_file(char *path, const char *head)
26{ 29{
30 unsigned char sha1[20];
31 enum object_type type;
32 char *buf;
33 unsigned long size;
34 struct commit *commit;
35 const char *paths[] = {path, NULL};
36 if (get_sha1(head, sha1))
37 return -1;
38 type = sha1_object_info(sha1, &size);
39 if(type == OBJ_COMMIT && path) {
40 commit = lookup_commit_reference(sha1);
41 match_path = path;
42 matched_sha1 = sha1;
43 found_path = 0;
44 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
45 if (!found_path)
46 return -1;
47 type = sha1_object_info(sha1, &size);
48 }
49 if (type == OBJ_BAD)
50 return -1;
51 buf = read_sha1_file(sha1, &type, &size);
52 if (!buf)
53 return -1;
54 buf[size] = '\0';
55 write(htmlfd, buf, size);
56 return 0;
57}
27 58
59void cgit_print_blob(const char *hex, char *path, const char *head)
60{
28 unsigned char sha1[20]; 61 unsigned char sha1[20];
29 enum object_type type; 62 enum object_type type;
30 char *buf; 63 char *buf;
31 unsigned long size; 64 unsigned long size;
32 struct commit *commit; 65 struct commit *commit;
33 const char *paths[] = {path, NULL}; 66 const char *paths[] = {path, NULL};
34 67
35 if (hex) { 68 if (hex) {
36 if (get_sha1_hex(hex, sha1)){ 69 if (get_sha1_hex(hex, sha1)){
37 cgit_print_error(fmt("Bad hex value: %s", hex)); 70 cgit_print_error(fmt("Bad hex value: %s", hex));
38 return; 71 return;
39 } 72 }
40 } else { 73 } else {
41 if (get_sha1(head,sha1)) { 74 if (get_sha1(head,sha1)) {
42 cgit_print_error(fmt("Bad ref: %s", head)); 75 cgit_print_error(fmt("Bad ref: %s", head));
43 return; 76 return;
44 } 77 }
45 } 78 }
46 79
47 type = sha1_object_info(sha1, &size); 80 type = sha1_object_info(sha1, &size);
48 81
49 if((!hex) && type == OBJ_COMMIT && path) { 82 if((!hex) && type == OBJ_COMMIT && path) {
50 commit = lookup_commit_reference(sha1); 83 commit = lookup_commit_reference(sha1);
51 match_path = path; 84 match_path = path;
52 matched_sha1 = sha1; 85 matched_sha1 = sha1;
53 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); 86 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
54 type = sha1_object_info(sha1,&size); 87 type = sha1_object_info(sha1,&size);
55 } 88 }
56 89
57 if (type == OBJ_BAD) { 90 if (type == OBJ_BAD) {
58 cgit_print_error(fmt("Bad object name: %s", hex)); 91 cgit_print_error(fmt("Bad object name: %s", hex));
59 return; 92 return;
60 } 93 }
61 94
62 buf = read_sha1_file(sha1, &type, &size); 95 buf = read_sha1_file(sha1, &type, &size);
63 if (!buf) { 96 if (!buf) {
64 cgit_print_error(fmt("Error reading object %s", hex)); 97 cgit_print_error(fmt("Error reading object %s", hex));
65 return; 98 return;
66 } 99 }
67 100
68 buf[size] = '\0'; 101 buf[size] = '\0';
69 ctx.page.mimetype = ctx.qry.mimetype; 102 ctx.page.mimetype = ctx.qry.mimetype;
70 if (!ctx.page.mimetype) { 103 if (!ctx.page.mimetype) {
71 if (buffer_is_binary(buf, size)) 104 if (buffer_is_binary(buf, size))
72 ctx.page.mimetype = "application/octet-stream"; 105 ctx.page.mimetype = "application/octet-stream";
73 else 106 else
74 ctx.page.mimetype = "text/plain"; 107 ctx.page.mimetype = "text/plain";
75 } 108 }
76 ctx.page.filename = path; 109 ctx.page.filename = path;
77 cgit_print_http_headers(&ctx); 110 cgit_print_http_headers(&ctx);
78 write(htmlfd, buf, size); 111 write(htmlfd, buf, size);
79} 112}