|
diff --git a/html.c b/html.c index 36e9a2f..167127f 100644 --- a/ html.c+++ b/ html.c |
|
@@ -67,128 +67,144 @@ void html_txt(char *txt) |
67 | { |
67 | { |
68 | char *t = txt; |
68 | char *t = txt; |
69 | while(t && *t){ |
69 | while(t && *t){ |
70 | int c = *t; |
70 | int c = *t; |
71 | if (c=='<' || c=='>' || c=='&') { |
71 | if (c=='<' || c=='>' || c=='&') { |
72 | write(htmlfd, txt, t - txt); |
72 | write(htmlfd, txt, t - txt); |
73 | if (c=='>') |
73 | if (c=='>') |
74 | html(">"); |
74 | html(">"); |
75 | else if (c=='<') |
75 | else if (c=='<') |
76 | html("<"); |
76 | html("<"); |
77 | else if (c=='&') |
77 | else if (c=='&') |
78 | html("&"); |
78 | html("&"); |
79 | txt = t+1; |
79 | txt = t+1; |
80 | } |
80 | } |
81 | t++; |
81 | t++; |
82 | } |
82 | } |
83 | if (t!=txt) |
83 | if (t!=txt) |
84 | html(txt); |
84 | html(txt); |
85 | } |
85 | } |
86 | |
86 | |
87 | void html_ntxt(int len, char *txt) |
87 | void html_ntxt(int len, char *txt) |
88 | { |
88 | { |
89 | char *t = txt; |
89 | char *t = txt; |
90 | while(t && *t && len--){ |
90 | while(t && *t && len--){ |
91 | int c = *t; |
91 | int c = *t; |
92 | if (c=='<' || c=='>' || c=='&') { |
92 | if (c=='<' || c=='>' || c=='&') { |
93 | write(htmlfd, txt, t - txt); |
93 | write(htmlfd, txt, t - txt); |
94 | if (c=='>') |
94 | if (c=='>') |
95 | html(">"); |
95 | html(">"); |
96 | else if (c=='<') |
96 | else if (c=='<') |
97 | html("<"); |
97 | html("<"); |
98 | else if (c=='&') |
98 | else if (c=='&') |
99 | html("&"); |
99 | html("&"); |
100 | txt = t+1; |
100 | txt = t+1; |
101 | } |
101 | } |
102 | t++; |
102 | t++; |
103 | } |
103 | } |
104 | if (t!=txt) |
104 | if (t!=txt) |
105 | write(htmlfd, txt, t - txt); |
105 | write(htmlfd, txt, t - txt); |
106 | if (len<0) |
106 | if (len<0) |
107 | html("..."); |
107 | html("..."); |
108 | } |
108 | } |
109 | |
109 | |
110 | void html_attr(char *txt) |
110 | void html_attr(char *txt) |
111 | { |
111 | { |
112 | char *t = txt; |
112 | char *t = txt; |
113 | while(t && *t){ |
113 | while(t && *t){ |
114 | int c = *t; |
114 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'') { |
115 | if (c=='<' || c=='>' || c=='\'') { |
116 | write(htmlfd, txt, t - txt); |
116 | write(htmlfd, txt, t - txt); |
117 | if (c=='>') |
117 | if (c=='>') |
118 | html(">"); |
118 | html(">"); |
119 | else if (c=='<') |
119 | else if (c=='<') |
120 | html("<"); |
120 | html("<"); |
121 | else if (c=='\'') |
121 | else if (c=='\'') |
122 | html(""e;"); |
122 | html(""e;"); |
123 | txt = t+1; |
123 | txt = t+1; |
124 | } |
124 | } |
125 | t++; |
125 | t++; |
126 | } |
126 | } |
127 | if (t!=txt) |
127 | if (t!=txt) |
128 | html(txt); |
128 | html(txt); |
129 | } |
129 | } |
130 | |
130 | |
| |
131 | void html_url_arg(char *txt) |
| |
132 | { |
| |
133 | char *t = txt; |
| |
134 | while(t && *t){ |
| |
135 | int c = *t; |
| |
136 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
| |
137 | write(htmlfd, txt, t - txt); |
| |
138 | write(htmlfd, fmt("%%%2x", c), 3); |
| |
139 | txt = t+1; |
| |
140 | } |
| |
141 | t++; |
| |
142 | } |
| |
143 | if (t!=txt) |
| |
144 | html(txt); |
| |
145 | } |
| |
146 | |
131 | void html_hidden(char *name, char *value) |
147 | void html_hidden(char *name, char *value) |
132 | { |
148 | { |
133 | html("<input type='hidden' name='"); |
149 | html("<input type='hidden' name='"); |
134 | html_attr(name); |
150 | html_attr(name); |
135 | html("' value='"); |
151 | html("' value='"); |
136 | html_attr(value); |
152 | html_attr(value); |
137 | html("'/>"); |
153 | html("'/>"); |
138 | } |
154 | } |
139 | |
155 | |
140 | void html_option(char *value, char *text, char *selected_value) |
156 | void html_option(char *value, char *text, char *selected_value) |
141 | { |
157 | { |
142 | html("<option value='"); |
158 | html("<option value='"); |
143 | html_attr(value); |
159 | html_attr(value); |
144 | html("'"); |
160 | html("'"); |
145 | if (selected_value && !strcmp(selected_value, value)) |
161 | if (selected_value && !strcmp(selected_value, value)) |
146 | html(" selected='selected'"); |
162 | html(" selected='selected'"); |
147 | html(">"); |
163 | html(">"); |
148 | html_txt(text); |
164 | html_txt(text); |
149 | html("</option>\n"); |
165 | html("</option>\n"); |
150 | } |
166 | } |
151 | |
167 | |
152 | void html_link_open(char *url, char *title, char *class) |
168 | void html_link_open(char *url, char *title, char *class) |
153 | { |
169 | { |
154 | html("<a href='"); |
170 | html("<a href='"); |
155 | html_attr(url); |
171 | html_attr(url); |
156 | if (title) { |
172 | if (title) { |
157 | html("' title='"); |
173 | html("' title='"); |
158 | html_attr(title); |
174 | html_attr(title); |
159 | } |
175 | } |
160 | if (class) { |
176 | if (class) { |
161 | html("' class='"); |
177 | html("' class='"); |
162 | html_attr(class); |
178 | html_attr(class); |
163 | } |
179 | } |
164 | html("'>"); |
180 | html("'>"); |
165 | } |
181 | } |
166 | |
182 | |
167 | void html_link_close(void) |
183 | void html_link_close(void) |
168 | { |
184 | { |
169 | html("</a>"); |
185 | html("</a>"); |
170 | } |
186 | } |
171 | |
187 | |
172 | void html_fileperm(unsigned short mode) |
188 | void html_fileperm(unsigned short mode) |
173 | { |
189 | { |
174 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
190 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
175 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
191 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
176 | } |
192 | } |
177 | |
193 | |
178 | int html_include(const char *filename) |
194 | int html_include(const char *filename) |
179 | { |
195 | { |
180 | FILE *f; |
196 | FILE *f; |
181 | char buf[4096]; |
197 | char buf[4096]; |
182 | size_t len; |
198 | size_t len; |
183 | |
199 | |
184 | if (!(f = fopen(filename, "r"))) { |
200 | if (!(f = fopen(filename, "r"))) { |
185 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", |
201 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", |
186 | filename, strerror(errno), errno); |
202 | filename, strerror(errno), errno); |
187 | return -1; |
203 | return -1; |
188 | } |
204 | } |
189 | while((len = fread(buf, 1, 4096, f)) > 0) |
205 | while((len = fread(buf, 1, 4096, f)) > 0) |
190 | write(htmlfd, buf, len); |
206 | write(htmlfd, buf, len); |
191 | fclose(f); |
207 | fclose(f); |
192 | return 0; |
208 | return 0; |
193 | } |
209 | } |
194 | |
210 | |
|