|
diff --git a/ui-tree.c b/ui-tree.c index e16b638..1037c82 100644 --- a/ ui-tree.c+++ b/ ui-tree.c |
|
@@ -1,157 +1,156 @@ |
1 | /* ui-tree.c: functions for tree output |
1 | /* ui-tree.c: functions for tree output |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 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 | |
10 | |
11 | char *curr_rev; |
11 | char *curr_rev; |
12 | char *match_path; |
12 | char *match_path; |
13 | int header = 0; |
13 | int header = 0; |
14 | |
14 | |
15 | static void print_object(const unsigned char *sha1, char *path) |
15 | static void print_object(const unsigned char *sha1, char *path) |
16 | { |
16 | { |
17 | enum object_type type; |
17 | enum object_type type; |
18 | unsigned char *buf; |
18 | unsigned char *buf; |
19 | unsigned long size, lineno, start, idx; |
19 | unsigned long size, lineno, start, idx; |
20 | |
20 | |
21 | type = sha1_object_info(sha1, &size); |
21 | type = sha1_object_info(sha1, &size); |
22 | if (type == OBJ_BAD) { |
22 | if (type == OBJ_BAD) { |
23 | cgit_print_error(fmt("Bad object name: %s", |
23 | cgit_print_error(fmt("Bad object name: %s", |
24 | sha1_to_hex(sha1))); |
24 | sha1_to_hex(sha1))); |
25 | return; |
25 | return; |
26 | } |
26 | } |
27 | |
27 | |
28 | buf = read_sha1_file(sha1, &type, &size); |
28 | buf = read_sha1_file(sha1, &type, &size); |
29 | if (!buf) { |
29 | if (!buf) { |
30 | cgit_print_error(fmt("Error reading object %s", |
30 | cgit_print_error(fmt("Error reading object %s", |
31 | sha1_to_hex(sha1))); |
31 | sha1_to_hex(sha1))); |
32 | return; |
32 | return; |
33 | } |
33 | } |
34 | |
34 | |
35 | html("<table class='blob'>\n"); |
35 | html("<table class='blob'>\n"); |
36 | idx = 0; |
36 | idx = 0; |
37 | start = 0; |
37 | start = 0; |
38 | lineno = 0; |
38 | lineno = 0; |
39 | while(idx < size) { |
39 | while(idx < size) { |
40 | if (buf[idx] == '\n') { |
40 | if (buf[idx] == '\n') { |
41 | buf[idx] = '\0'; |
41 | buf[idx] = '\0'; |
42 | htmlf("<tr><td class='no'>%d</td><td class='txt'>", |
42 | htmlf("<tr><td class='no'>%d</td><td class='txt'>", |
43 | ++lineno); |
43 | ++lineno); |
44 | html_txt(buf + start); |
44 | html_txt(buf + start); |
45 | html("</td></tr>\n"); |
45 | html("</td></tr>\n"); |
46 | start = idx + 1; |
46 | start = idx + 1; |
47 | } |
47 | } |
48 | idx++; |
48 | idx++; |
49 | } |
49 | } |
50 | html("</table>\n"); |
50 | html("</table>\n"); |
51 | } |
51 | } |
52 | |
52 | |
53 | |
53 | |
54 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
54 | static int ls_item(const unsigned char *sha1, const char *base, int baselen, |
55 | const char *pathname, unsigned int mode, int stage) |
55 | const char *pathname, unsigned int mode, int stage) |
56 | { |
56 | { |
57 | char *name; |
57 | char *name; |
58 | char *fullpath; |
58 | char *fullpath; |
59 | enum object_type type; |
59 | enum object_type type; |
60 | unsigned long size = 0; |
60 | unsigned long size = 0; |
61 | char *url, *qry; |
| |
62 | |
61 | |
63 | name = xstrdup(pathname); |
62 | name = xstrdup(pathname); |
64 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
63 | fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", |
65 | cgit_query_path ? "/" : "", name); |
64 | cgit_query_path ? "/" : "", name); |
66 | |
65 | |
67 | type = sha1_object_info(sha1, &size); |
66 | type = sha1_object_info(sha1, &size); |
68 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
67 | if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { |
69 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
68 | htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", |
70 | name, |
69 | name, |
71 | sha1_to_hex(sha1)); |
70 | sha1_to_hex(sha1)); |
72 | return 0; |
71 | return 0; |
73 | } |
72 | } |
74 | |
73 | |
75 | html("<tr><td class='ls-mode'>"); |
74 | html("<tr><td class='ls-mode'>"); |
76 | html_filemode(mode); |
75 | html_filemode(mode); |
77 | html("</td><td>"); |
76 | html("</td><td>"); |
78 | if (S_ISDIRLNK(mode)) { |
77 | if (S_ISDIRLNK(mode)) { |
79 | htmlf("<a class='ls-mod' href='"); |
78 | htmlf("<a class='ls-mod' href='"); |
80 | html_attr(fmt(cgit_repo->module_link, |
79 | html_attr(fmt(cgit_repo->module_link, |
81 | name, |
80 | name, |
82 | sha1_to_hex(sha1))); |
81 | sha1_to_hex(sha1))); |
83 | html("'>"); |
82 | html("'>"); |
84 | html_txt(name); |
83 | html_txt(name); |
85 | html("</a>"); |
84 | html("</a>"); |
86 | } else if (S_ISDIR(mode)) { |
85 | } else if (S_ISDIR(mode)) { |
87 | cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, |
86 | cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, |
88 | curr_rev, fullpath); |
87 | curr_rev, fullpath); |
89 | } else { |
88 | } else { |
90 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, |
89 | cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, |
91 | curr_rev, fullpath); |
90 | curr_rev, fullpath); |
92 | } |
91 | } |
93 | htmlf("</td><td class='ls-size'>%li</td>", size); |
92 | htmlf("</td><td class='ls-size'>%li</td>", size); |
94 | |
93 | |
95 | html("<td>"); |
94 | html("<td>"); |
96 | cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev, |
95 | cgit_log_link("L", "Log", "button", cgit_query_head, curr_rev, |
97 | fullpath); |
96 | fullpath); |
98 | html("</td></tr>\n"); |
97 | html("</td></tr>\n"); |
99 | free(name); |
98 | free(name); |
100 | return 0; |
99 | return 0; |
101 | } |
100 | } |
102 | |
101 | |
103 | static void ls_head() |
102 | static void ls_head() |
104 | { |
103 | { |
105 | html("<table class='list'>\n"); |
104 | html("<table class='list'>\n"); |
106 | html("<tr class='nohover'>"); |
105 | html("<tr class='nohover'>"); |
107 | html("<th class='left'>Mode</th>"); |
106 | html("<th class='left'>Mode</th>"); |
108 | html("<th class='left'>Name</th>"); |
107 | html("<th class='left'>Name</th>"); |
109 | html("<th class='right'>Size</th>"); |
108 | html("<th class='right'>Size</th>"); |
110 | html("<th/>"); |
109 | html("<th/>"); |
111 | html("</tr>\n"); |
110 | html("</tr>\n"); |
112 | header = 1; |
111 | header = 1; |
113 | } |
112 | } |
114 | |
113 | |
115 | static void ls_tail() |
114 | static void ls_tail() |
116 | { |
115 | { |
117 | if (!header) |
116 | if (!header) |
118 | return; |
117 | return; |
119 | html("</table>\n"); |
118 | html("</table>\n"); |
120 | header = 0; |
119 | header = 0; |
121 | } |
120 | } |
122 | |
121 | |
123 | static void ls_tree(const unsigned char *sha1, char *path) |
122 | static void ls_tree(const unsigned char *sha1, char *path) |
124 | { |
123 | { |
125 | struct tree *tree; |
124 | struct tree *tree; |
126 | |
125 | |
127 | tree = parse_tree_indirect(sha1); |
126 | tree = parse_tree_indirect(sha1); |
128 | if (!tree) { |
127 | if (!tree) { |
129 | cgit_print_error(fmt("Not a tree object: %s", |
128 | cgit_print_error(fmt("Not a tree object: %s", |
130 | sha1_to_hex(sha1))); |
129 | sha1_to_hex(sha1))); |
131 | return; |
130 | return; |
132 | } |
131 | } |
133 | |
132 | |
134 | ls_head(); |
133 | ls_head(); |
135 | read_tree_recursive(tree, "", 0, 1, NULL, ls_item); |
134 | read_tree_recursive(tree, "", 0, 1, NULL, ls_item); |
136 | ls_tail(); |
135 | ls_tail(); |
137 | } |
136 | } |
138 | |
137 | |
139 | |
138 | |
140 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
139 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
141 | const char *pathname, unsigned mode, int stage) |
140 | const char *pathname, unsigned mode, int stage) |
142 | { |
141 | { |
143 | static int state; |
142 | static int state; |
144 | static char buffer[PATH_MAX]; |
143 | static char buffer[PATH_MAX]; |
145 | char *url; |
144 | char *url; |
146 | |
145 | |
147 | if (state == 0) { |
146 | if (state == 0) { |
148 | memcpy(buffer, base, baselen); |
147 | memcpy(buffer, base, baselen); |
149 | strcpy(buffer+baselen, pathname); |
148 | strcpy(buffer+baselen, pathname); |
150 | url = cgit_pageurl(cgit_query_repo, "tree", |
149 | url = cgit_pageurl(cgit_query_repo, "tree", |
151 | fmt("h=%s&path=%s", curr_rev, buffer)); |
150 | fmt("h=%s&path=%s", curr_rev, buffer)); |
152 | html("/"); |
151 | html("/"); |
153 | cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head, |
152 | cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head, |
154 | curr_rev, buffer); |
153 | curr_rev, buffer); |
155 | |
154 | |
156 | if (strcmp(match_path, buffer)) |
155 | if (strcmp(match_path, buffer)) |
157 | return READ_TREE_RECURSIVE; |
156 | return READ_TREE_RECURSIVE; |
|