summaryrefslogtreecommitdiffabout
path: root/ui-tree.c
authorLars Hjemli <hjemli@gmail.com>2008-03-25 01:43:51 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-04-08 19:35:00 (UTC)
commitfa4dfee5489d8c829da92637dd84e8650439f313 (patch) (unidiff)
tree2c5e6ffd0a20de58de7353acb278e76a56d23bb6 /ui-tree.c
parent23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (diff)
downloadcgit-fa4dfee5489d8c829da92637dd84e8650439f313.zip
cgit-fa4dfee5489d8c829da92637dd84e8650439f313.tar.gz
cgit-fa4dfee5489d8c829da92637dd84e8650439f313.tar.bz2
Don't specify mimetype in ui-blob.c
But be sure to specify correct filename. This way, the client can hopefully guess a sensible mimetype based on the filename suffix, and cgit can ignore the issue altogether. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-tree.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tree.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 9be3140..2f052c7 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -15,49 +15,50 @@ char *match_path;
15int header = 0; 15int header = 0;
16 16
17static void print_object(const unsigned char *sha1, char *path) 17static void print_object(const unsigned char *sha1, char *path)
18{ 18{
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf;
21 unsigned long size, lineno, start, idx; 21 unsigned long size, lineno, start, idx;
22 const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>"; 22 const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
23 23
24 type = sha1_object_info(sha1, &size); 24 type = sha1_object_info(sha1, &size);
25 if (type == OBJ_BAD) { 25 if (type == OBJ_BAD) {
26 cgit_print_error(fmt("Bad object name: %s", 26 cgit_print_error(fmt("Bad object name: %s",
27 sha1_to_hex(sha1))); 27 sha1_to_hex(sha1)));
28 return; 28 return;
29 } 29 }
30 30
31 buf = read_sha1_file(sha1, &type, &size); 31 buf = read_sha1_file(sha1, &type, &size);
32 if (!buf) { 32 if (!buf) {
33 cgit_print_error(fmt("Error reading object %s", 33 cgit_print_error(fmt("Error reading object %s",
34 sha1_to_hex(sha1))); 34 sha1_to_hex(sha1)));
35 return; 35 return;
36 } 36 }
37 37
38 html(" blob: <a href='"); 38 html(" blob: <a href='");
39 html_attr(cgit_pageurl(ctx.qry.repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); 39 html_attr(cgit_pageurl(ctx.qry.repo, "blob",
40 fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));
40 htmlf("'>%s</a>",sha1_to_hex(sha1)); 41 htmlf("'>%s</a>",sha1_to_hex(sha1));
41 42
42 html("<table summary='blob content' class='blob'>\n"); 43 html("<table summary='blob content' class='blob'>\n");
43 idx = 0; 44 idx = 0;
44 start = 0; 45 start = 0;
45 lineno = 0; 46 lineno = 0;
46 while(idx < size) { 47 while(idx < size) {
47 if (buf[idx] == '\n') { 48 if (buf[idx] == '\n') {
48 buf[idx] = '\0'; 49 buf[idx] = '\0';
49 htmlf(linefmt, ++lineno); 50 htmlf(linefmt, ++lineno);
50 html_txt(buf + start); 51 html_txt(buf + start);
51 html("</td></tr>\n"); 52 html("</td></tr>\n");
52 start = idx + 1; 53 start = idx + 1;
53 } 54 }
54 idx++; 55 idx++;
55 } 56 }
56 htmlf(linefmt, ++lineno); 57 htmlf(linefmt, ++lineno);
57 html_txt(buf + start); 58 html_txt(buf + start);
58 html("</td></tr>\n"); 59 html("</td></tr>\n");
59 html("</table>\n"); 60 html("</table>\n");
60} 61}
61 62
62 63
63static int ls_item(const unsigned char *sha1, const char *base, int baselen, 64static int ls_item(const unsigned char *sha1, const char *base, int baselen,