summaryrefslogtreecommitdiffabout
path: root/ui-tree.c
authorLars Hjemli <hjemli@gmail.com>2007-09-19 21:46:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-09-19 21:46:59 (UTC)
commit63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3 (patch) (unidiff)
treed6b31c994f861579e6d7085ba52a41a37cd69868 /ui-tree.c
parent7921572fb1fd28ec7523fcf5ed03eaf8a3432e65 (diff)
downloadcgit-63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3.zip
cgit-63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3.tar.gz
cgit-63d5f5eaeadf060a0c8c94ac3b32e51b469b6af3.tar.bz2
ui-tree: specify parameter position for all htmlf formats
The GNU C library manual tells us that behavior is undefined if only some formats has a specification for the parameter position. Noticed-by: <mkraai@beckman.com> 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-tree.c b/ui-tree.c
index 1cb09f7..ef44d61 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,142 +1,142 @@
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
11char *curr_rev; 11char *curr_rev;
12char *match_path; 12char *match_path;
13int header = 0; 13int header = 0;
14 14
15static void print_object(const unsigned char *sha1, char *path) 15static 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(" blob: <a href='"); 35 html(" blob: <a href='");
36 html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); 36 html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
37 htmlf("'>%s</a>",sha1_to_hex(sha1)); 37 htmlf("'>%s</a>",sha1_to_hex(sha1));
38 38
39 html("<table class='blob'>\n"); 39 html("<table class='blob'>\n");
40 idx = 0; 40 idx = 0;
41 start = 0; 41 start = 0;
42 lineno = 0; 42 lineno = 0;
43 while(idx < size) { 43 while(idx < size) {
44 if (buf[idx] == '\n') { 44 if (buf[idx] == '\n') {
45 buf[idx] = '\0'; 45 buf[idx] = '\0';
46 htmlf("<tr><td class='no'><a name='%d'>%1$d</a></td><td class='txt'>", 46 htmlf("<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>",
47 ++lineno); 47 ++lineno);
48 html_txt(buf + start); 48 html_txt(buf + start);
49 html("</td></tr>\n"); 49 html("</td></tr>\n");
50 start = idx + 1; 50 start = idx + 1;
51 } 51 }
52 idx++; 52 idx++;
53 } 53 }
54 html("</table>\n"); 54 html("</table>\n");
55} 55}
56 56
57 57
58static int ls_item(const unsigned char *sha1, const char *base, int baselen, 58static int ls_item(const unsigned char *sha1, const char *base, int baselen,
59 const char *pathname, unsigned int mode, int stage) 59 const char *pathname, unsigned int mode, int stage)
60{ 60{
61 char *name; 61 char *name;
62 char *fullpath; 62 char *fullpath;
63 enum object_type type; 63 enum object_type type;
64 unsigned long size = 0; 64 unsigned long size = 0;
65 65
66 name = xstrdup(pathname); 66 name = xstrdup(pathname);
67 fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", 67 fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
68 cgit_query_path ? "/" : "", name); 68 cgit_query_path ? "/" : "", name);
69 69
70 type = sha1_object_info(sha1, &size); 70 type = sha1_object_info(sha1, &size);
71 if (type == OBJ_BAD && !S_ISGITLINK(mode)) { 71 if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
72 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 72 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
73 name, 73 name,
74 sha1_to_hex(sha1)); 74 sha1_to_hex(sha1));
75 return 0; 75 return 0;
76 } 76 }
77 77
78 html("<tr><td class='ls-mode'>"); 78 html("<tr><td class='ls-mode'>");
79 html_filemode(mode); 79 html_filemode(mode);
80 html("</td><td>"); 80 html("</td><td>");
81 if (S_ISGITLINK(mode)) { 81 if (S_ISGITLINK(mode)) {
82 htmlf("<a class='ls-mod' href='"); 82 htmlf("<a class='ls-mod' href='");
83 html_attr(fmt(cgit_repo->module_link, 83 html_attr(fmt(cgit_repo->module_link,
84 name, 84 name,
85 sha1_to_hex(sha1))); 85 sha1_to_hex(sha1)));
86 html("'>"); 86 html("'>");
87 html_txt(name); 87 html_txt(name);
88 html("</a>"); 88 html("</a>");
89 } else if (S_ISDIR(mode)) { 89 } else if (S_ISDIR(mode)) {
90 cgit_tree_link(name, NULL, "ls-dir", cgit_query_head, 90 cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
91 curr_rev, fullpath); 91 curr_rev, fullpath);
92 } else { 92 } else {
93 cgit_tree_link(name, NULL, "ls-blob", cgit_query_head, 93 cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
94 curr_rev, fullpath); 94 curr_rev, fullpath);
95 } 95 }
96 htmlf("</td><td class='ls-size'>%li</td>", size); 96 htmlf("</td><td class='ls-size'>%li</td>", size);
97 97
98 html("<td>"); 98 html("<td>");
99 cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev, 99 cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
100 fullpath, 0); 100 fullpath, 0);
101 html("</td></tr>\n"); 101 html("</td></tr>\n");
102 free(name); 102 free(name);
103 return 0; 103 return 0;
104} 104}
105 105
106static void ls_head() 106static void ls_head()
107{ 107{
108 html("<table class='list'>\n"); 108 html("<table class='list'>\n");
109 html("<tr class='nohover'>"); 109 html("<tr class='nohover'>");
110 html("<th class='left'>Mode</th>"); 110 html("<th class='left'>Mode</th>");
111 html("<th class='left'>Name</th>"); 111 html("<th class='left'>Name</th>");
112 html("<th class='right'>Size</th>"); 112 html("<th class='right'>Size</th>");
113 html("<th/>"); 113 html("<th/>");
114 html("</tr>\n"); 114 html("</tr>\n");
115 header = 1; 115 header = 1;
116} 116}
117 117
118static void ls_tail() 118static void ls_tail()
119{ 119{
120 if (!header) 120 if (!header)
121 return; 121 return;
122 html("</table>\n"); 122 html("</table>\n");
123 header = 0; 123 header = 0;
124} 124}
125 125
126static void ls_tree(const unsigned char *sha1, char *path) 126static void ls_tree(const unsigned char *sha1, char *path)
127{ 127{
128 struct tree *tree; 128 struct tree *tree;
129 129
130 tree = parse_tree_indirect(sha1); 130 tree = parse_tree_indirect(sha1);
131 if (!tree) { 131 if (!tree) {
132 cgit_print_error(fmt("Not a tree object: %s", 132 cgit_print_error(fmt("Not a tree object: %s",
133 sha1_to_hex(sha1))); 133 sha1_to_hex(sha1)));
134 return; 134 return;
135 } 135 }
136 136
137 ls_head(); 137 ls_head();
138 read_tree_recursive(tree, "", 0, 1, NULL, ls_item); 138 read_tree_recursive(tree, "", 0, 1, NULL, ls_item);
139 ls_tail(); 139 ls_tail();
140} 140}
141 141
142 142