author | Lars Hjemli <hjemli@gmail.com> | 2010-11-09 17:15:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-11-09 23:22:41 (UTC) |
commit | c2680325f68192368d32f26458fea9cfb50df6e5 (patch) (unidiff) | |
tree | 0d74253749f3feb2f954b311c4279be0d4494512 | |
parent | a3c3c04bdf8245b662f9e91502e8b6bd51682da3 (diff) | |
download | cgit-c2680325f68192368d32f26458fea9cfb50df6e5.zip cgit-c2680325f68192368d32f26458fea9cfb50df6e5.tar.gz cgit-c2680325f68192368d32f26458fea9cfb50df6e5.tar.bz2 |
html.c: use '+' to escape spaces in urls
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | html.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,280 +1,280 @@ | |||
1 | /* html.c: helper functions for html output | 1 | /* html.c: helper functions for html 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 <unistd.h> | 9 | #include <unistd.h> |
10 | #include <stdio.h> | 10 | #include <stdio.h> |
11 | #include <stdlib.h> | 11 | #include <stdlib.h> |
12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
13 | #include <string.h> | 13 | #include <string.h> |
14 | #include <errno.h> | 14 | #include <errno.h> |
15 | 15 | ||
16 | /* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */ | 16 | /* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */ |
17 | static const char* url_escape_table[256] = { | 17 | static const char* url_escape_table[256] = { |
18 | "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", | 18 | "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", |
19 | "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", | 19 | "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", |
20 | "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", | 20 | "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", |
21 | "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, | 21 | "%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, |
22 | "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d", | 22 | "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d", |
23 | "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, | 23 | "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, |
24 | 0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0, | 24 | 0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0, |
25 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b", | 25 | 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b", |
26 | "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", | 26 | "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", |
27 | "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", | 27 | "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", |
28 | "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", | 28 | "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", |
29 | "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", | 29 | "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", |
30 | "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", | 30 | "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", |
31 | "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", | 31 | "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", |
32 | "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", | 32 | "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", |
33 | "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", | 33 | "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", |
34 | "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", | 34 | "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", |
35 | "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", | 35 | "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", |
36 | "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", | 36 | "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", |
37 | "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", | 37 | "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", |
38 | "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", | 38 | "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", |
39 | "%fe", "%ff" | 39 | "%fe", "%ff" |
40 | }; | 40 | }; |
41 | 41 | ||
42 | int htmlfd = STDOUT_FILENO; | 42 | int htmlfd = STDOUT_FILENO; |
43 | 43 | ||
44 | char *fmt(const char *format, ...) | 44 | char *fmt(const char *format, ...) |
45 | { | 45 | { |
46 | static char buf[8][1024]; | 46 | static char buf[8][1024]; |
47 | static int bufidx; | 47 | static int bufidx; |
48 | int len; | 48 | int len; |
49 | va_list args; | 49 | va_list args; |
50 | 50 | ||
51 | bufidx++; | 51 | bufidx++; |
52 | bufidx &= 7; | 52 | bufidx &= 7; |
53 | 53 | ||
54 | va_start(args, format); | 54 | va_start(args, format); |
55 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); | 55 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); |
56 | va_end(args); | 56 | va_end(args); |
57 | if (len>sizeof(buf[bufidx])) { | 57 | if (len>sizeof(buf[bufidx])) { |
58 | fprintf(stderr, "[html.c] string truncated: %s\n", format); | 58 | fprintf(stderr, "[html.c] string truncated: %s\n", format); |
59 | exit(1); | 59 | exit(1); |
60 | } | 60 | } |
61 | return buf[bufidx]; | 61 | return buf[bufidx]; |
62 | } | 62 | } |
63 | 63 | ||
64 | void html_raw(const char *data, size_t size) | 64 | void html_raw(const char *data, size_t size) |
65 | { | 65 | { |
66 | write(htmlfd, data, size); | 66 | write(htmlfd, data, size); |
67 | } | 67 | } |
68 | 68 | ||
69 | void html(const char *txt) | 69 | void html(const char *txt) |
70 | { | 70 | { |
71 | write(htmlfd, txt, strlen(txt)); | 71 | write(htmlfd, txt, strlen(txt)); |
72 | } | 72 | } |
73 | 73 | ||
74 | void htmlf(const char *format, ...) | 74 | void htmlf(const char *format, ...) |
75 | { | 75 | { |
76 | static char buf[65536]; | 76 | static char buf[65536]; |
77 | va_list args; | 77 | va_list args; |
78 | 78 | ||
79 | va_start(args, format); | 79 | va_start(args, format); |
80 | vsnprintf(buf, sizeof(buf), format, args); | 80 | vsnprintf(buf, sizeof(buf), format, args); |
81 | va_end(args); | 81 | va_end(args); |
82 | html(buf); | 82 | html(buf); |
83 | } | 83 | } |
84 | 84 | ||
85 | void html_status(int code, const char *msg, int more_headers) | 85 | void html_status(int code, const char *msg, int more_headers) |
86 | { | 86 | { |
87 | htmlf("Status: %d %s\n", code, msg); | 87 | htmlf("Status: %d %s\n", code, msg); |
88 | if (!more_headers) | 88 | if (!more_headers) |
89 | html("\n"); | 89 | html("\n"); |
90 | } | 90 | } |
91 | 91 | ||
92 | void html_txt(const char *txt) | 92 | void html_txt(const char *txt) |
93 | { | 93 | { |
94 | const char *t = txt; | 94 | const char *t = txt; |
95 | while(t && *t){ | 95 | while(t && *t){ |
96 | int c = *t; | 96 | int c = *t; |
97 | if (c=='<' || c=='>' || c=='&') { | 97 | if (c=='<' || c=='>' || c=='&') { |
98 | html_raw(txt, t - txt); | 98 | html_raw(txt, t - txt); |
99 | if (c=='>') | 99 | if (c=='>') |
100 | html(">"); | 100 | html(">"); |
101 | else if (c=='<') | 101 | else if (c=='<') |
102 | html("<"); | 102 | html("<"); |
103 | else if (c=='&') | 103 | else if (c=='&') |
104 | html("&"); | 104 | html("&"); |
105 | txt = t+1; | 105 | txt = t+1; |
106 | } | 106 | } |
107 | t++; | 107 | t++; |
108 | } | 108 | } |
109 | if (t!=txt) | 109 | if (t!=txt) |
110 | html(txt); | 110 | html(txt); |
111 | } | 111 | } |
112 | 112 | ||
113 | void html_ntxt(int len, const char *txt) | 113 | void html_ntxt(int len, const char *txt) |
114 | { | 114 | { |
115 | const char *t = txt; | 115 | const char *t = txt; |
116 | while(t && *t && len--){ | 116 | while(t && *t && len--){ |
117 | int c = *t; | 117 | int c = *t; |
118 | if (c=='<' || c=='>' || c=='&') { | 118 | if (c=='<' || c=='>' || c=='&') { |
119 | html_raw(txt, t - txt); | 119 | html_raw(txt, t - txt); |
120 | if (c=='>') | 120 | if (c=='>') |
121 | html(">"); | 121 | html(">"); |
122 | else if (c=='<') | 122 | else if (c=='<') |
123 | html("<"); | 123 | html("<"); |
124 | else if (c=='&') | 124 | else if (c=='&') |
125 | html("&"); | 125 | html("&"); |
126 | txt = t+1; | 126 | txt = t+1; |
127 | } | 127 | } |
128 | t++; | 128 | t++; |
129 | } | 129 | } |
130 | if (t!=txt) | 130 | if (t!=txt) |
131 | html_raw(txt, t - txt); | 131 | html_raw(txt, t - txt); |
132 | if (len<0) | 132 | if (len<0) |
133 | html("..."); | 133 | html("..."); |
134 | } | 134 | } |
135 | 135 | ||
136 | void html_attr(const char *txt) | 136 | void html_attr(const char *txt) |
137 | { | 137 | { |
138 | const char *t = txt; | 138 | const char *t = txt; |
139 | while(t && *t){ | 139 | while(t && *t){ |
140 | int c = *t; | 140 | int c = *t; |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
142 | html_raw(txt, t - txt); | 142 | html_raw(txt, t - txt); |
143 | if (c=='>') | 143 | if (c=='>') |
144 | html(">"); | 144 | html(">"); |
145 | else if (c=='<') | 145 | else if (c=='<') |
146 | html("<"); | 146 | html("<"); |
147 | else if (c=='\'') | 147 | else if (c=='\'') |
148 | html("'"); | 148 | html("'"); |
149 | else if (c=='"') | 149 | else if (c=='"') |
150 | html("""); | 150 | html("""); |
151 | txt = t+1; | 151 | txt = t+1; |
152 | } | 152 | } |
153 | t++; | 153 | t++; |
154 | } | 154 | } |
155 | if (t!=txt) | 155 | if (t!=txt) |
156 | html(txt); | 156 | html(txt); |
157 | } | 157 | } |
158 | 158 | ||
159 | void html_url_path(const char *txt) | 159 | void html_url_path(const char *txt) |
160 | { | 160 | { |
161 | const char *t = txt; | 161 | const char *t = txt; |
162 | while(t && *t){ | 162 | while(t && *t){ |
163 | int c = *t; | 163 | int c = *t; |
164 | const char *e = url_escape_table[c]; | 164 | const char *e = url_escape_table[c]; |
165 | if (e && c!='+' && c!='&' && c!='+') { | 165 | if (e && c!='+' && c!='&' && c!='+') { |
166 | html_raw(txt, t - txt); | 166 | html_raw(txt, t - txt); |
167 | html_raw(e, 3); | 167 | html_raw(e, 3); |
168 | txt = t+1; | 168 | txt = t+1; |
169 | } | 169 | } |
170 | t++; | 170 | t++; |
171 | } | 171 | } |
172 | if (t!=txt) | 172 | if (t!=txt) |
173 | html(txt); | 173 | html(txt); |
174 | } | 174 | } |
175 | 175 | ||
176 | void html_url_arg(const char *txt) | 176 | void html_url_arg(const char *txt) |
177 | { | 177 | { |
178 | const char *t = txt; | 178 | const char *t = txt; |
179 | while(t && *t){ | 179 | while(t && *t){ |
180 | int c = *t; | 180 | int c = *t; |
181 | const char *e = url_escape_table[c]; | 181 | const char *e = url_escape_table[c]; |
182 | if (e) { | 182 | if (e) { |
183 | html_raw(txt, t - txt); | 183 | html_raw(txt, t - txt); |
184 | html_raw(e, 3); | 184 | html_raw(e, strlen(e)); |
185 | txt = t+1; | 185 | txt = t+1; |
186 | } | 186 | } |
187 | t++; | 187 | t++; |
188 | } | 188 | } |
189 | if (t!=txt) | 189 | if (t!=txt) |
190 | html(txt); | 190 | html(txt); |
191 | } | 191 | } |
192 | 192 | ||
193 | void html_hidden(const char *name, const char *value) | 193 | void html_hidden(const char *name, const char *value) |
194 | { | 194 | { |
195 | html("<input type='hidden' name='"); | 195 | html("<input type='hidden' name='"); |
196 | html_attr(name); | 196 | html_attr(name); |
197 | html("' value='"); | 197 | html("' value='"); |
198 | html_attr(value); | 198 | html_attr(value); |
199 | html("'/>"); | 199 | html("'/>"); |
200 | } | 200 | } |
201 | 201 | ||
202 | void html_option(const char *value, const char *text, const char *selected_value) | 202 | void html_option(const char *value, const char *text, const char *selected_value) |
203 | { | 203 | { |
204 | html("<option value='"); | 204 | html("<option value='"); |
205 | html_attr(value); | 205 | html_attr(value); |
206 | html("'"); | 206 | html("'"); |
207 | if (selected_value && !strcmp(selected_value, value)) | 207 | if (selected_value && !strcmp(selected_value, value)) |
208 | html(" selected='selected'"); | 208 | html(" selected='selected'"); |
209 | html(">"); | 209 | html(">"); |
210 | html_txt(text); | 210 | html_txt(text); |
211 | html("</option>\n"); | 211 | html("</option>\n"); |
212 | } | 212 | } |
213 | 213 | ||
214 | void html_link_open(const char *url, const char *title, const char *class) | 214 | void html_link_open(const char *url, const char *title, const char *class) |
215 | { | 215 | { |
216 | html("<a href='"); | 216 | html("<a href='"); |
217 | html_attr(url); | 217 | html_attr(url); |
218 | if (title) { | 218 | if (title) { |
219 | html("' title='"); | 219 | html("' title='"); |
220 | html_attr(title); | 220 | html_attr(title); |
221 | } | 221 | } |
222 | if (class) { | 222 | if (class) { |
223 | html("' class='"); | 223 | html("' class='"); |
224 | html_attr(class); | 224 | html_attr(class); |
225 | } | 225 | } |
226 | html("'>"); | 226 | html("'>"); |
227 | } | 227 | } |
228 | 228 | ||
229 | void html_link_close(void) | 229 | void html_link_close(void) |
230 | { | 230 | { |
231 | html("</a>"); | 231 | html("</a>"); |
232 | } | 232 | } |
233 | 233 | ||
234 | void html_fileperm(unsigned short mode) | 234 | void html_fileperm(unsigned short mode) |
235 | { | 235 | { |
236 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), | 236 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
237 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); | 237 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
238 | } | 238 | } |
239 | 239 | ||
240 | int html_include(const char *filename) | 240 | int html_include(const char *filename) |
241 | { | 241 | { |
242 | FILE *f; | 242 | FILE *f; |
243 | char buf[4096]; | 243 | char buf[4096]; |
244 | size_t len; | 244 | size_t len; |
245 | 245 | ||
246 | if (!(f = fopen(filename, "r"))) { | 246 | if (!(f = fopen(filename, "r"))) { |
247 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", | 247 | fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n", |
248 | filename, strerror(errno), errno); | 248 | filename, strerror(errno), errno); |
249 | return -1; | 249 | return -1; |
250 | } | 250 | } |
251 | while((len = fread(buf, 1, 4096, f)) > 0) | 251 | while((len = fread(buf, 1, 4096, f)) > 0) |
252 | html_raw(buf, len); | 252 | html_raw(buf, len); |
253 | fclose(f); | 253 | fclose(f); |
254 | return 0; | 254 | return 0; |
255 | } | 255 | } |
256 | 256 | ||
257 | int hextoint(char c) | 257 | int hextoint(char c) |
258 | { | 258 | { |
259 | if (c >= 'a' && c <= 'f') | 259 | if (c >= 'a' && c <= 'f') |
260 | return 10 + c - 'a'; | 260 | return 10 + c - 'a'; |
261 | else if (c >= 'A' && c <= 'F') | 261 | else if (c >= 'A' && c <= 'F') |
262 | return 10 + c - 'A'; | 262 | return 10 + c - 'A'; |
263 | else if (c >= '0' && c <= '9') | 263 | else if (c >= '0' && c <= '9') |
264 | return c - '0'; | 264 | return c - '0'; |
265 | else | 265 | else |
266 | return -1; | 266 | return -1; |
267 | } | 267 | } |
268 | 268 | ||
269 | char *convert_query_hexchar(char *txt) | 269 | char *convert_query_hexchar(char *txt) |
270 | { | 270 | { |
271 | int d1, d2, n; | 271 | int d1, d2, n; |
272 | n = strlen(txt); | 272 | n = strlen(txt); |
273 | if (n < 3) { | 273 | if (n < 3) { |
274 | *txt = '\0'; | 274 | *txt = '\0'; |
275 | return txt-1; | 275 | return txt-1; |
276 | } | 276 | } |
277 | d1 = hextoint(*(txt+1)); | 277 | d1 = hextoint(*(txt+1)); |
278 | d2 = hextoint(*(txt+2)); | 278 | d2 = hextoint(*(txt+2)); |
279 | if (d1<0 || d2<0) { | 279 | if (d1<0 || d2<0) { |
280 | memmove(txt, txt+3, n-3); | 280 | memmove(txt, txt+3, n-3); |