|
diff --git a/html.c b/html.c index d86b2c1..1305910 100644 --- a/ html.c+++ b/ html.c |
|
@@ -12,8 +12,34 @@ |
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!$()*,./:;@- */ |
| |
17 | static const char* url_escape_table[256] = { |
| |
18 | "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", |
| |
19 | "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", |
| |
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, |
| |
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, |
| |
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", |
| |
26 | "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", |
| |
27 | "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", |
| |
28 | "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", |
| |
29 | "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", |
| |
30 | "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", |
| |
31 | "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", |
| |
32 | "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", |
| |
33 | "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", |
| |
34 | "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", |
| |
35 | "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", |
| |
36 | "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", |
| |
37 | "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", |
| |
38 | "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", |
| |
39 | "%fe", "%ff" |
| |
40 | }; |
| |
41 | |
16 | int htmlfd = STDOUT_FILENO; |
42 | int htmlfd = STDOUT_FILENO; |
17 | |
43 | |
18 | char *fmt(const char *format, ...) |
44 | char *fmt(const char *format, ...) |
19 | { |
45 | { |
@@ -62,15 +88,15 @@ void html_status(int code, const char *msg, int more_headers) |
62 | if (!more_headers) |
88 | if (!more_headers) |
63 | html("\n"); |
89 | html("\n"); |
64 | } |
90 | } |
65 | |
91 | |
66 | void html_txt(char *txt) |
92 | void html_txt(const char *txt) |
67 | { |
93 | { |
68 | char *t = txt; |
94 | const char *t = txt; |
69 | while(t && *t){ |
95 | while(t && *t){ |
70 | int c = *t; |
96 | int c = *t; |
71 | if (c=='<' || c=='>' || c=='&') { |
97 | if (c=='<' || c=='>' || c=='&') { |
72 | write(htmlfd, txt, t - txt); |
98 | html_raw(txt, t - txt); |
73 | if (c=='>') |
99 | if (c=='>') |
74 | html(">"); |
100 | html(">"); |
75 | else if (c=='<') |
101 | else if (c=='<') |
76 | html("<"); |
102 | html("<"); |
@@ -83,15 +109,15 @@ void html_txt(char *txt) |
83 | if (t!=txt) |
109 | if (t!=txt) |
84 | html(txt); |
110 | html(txt); |
85 | } |
111 | } |
86 | |
112 | |
87 | void html_ntxt(int len, char *txt) |
113 | void html_ntxt(int len, const char *txt) |
88 | { |
114 | { |
89 | char *t = txt; |
115 | const char *t = txt; |
90 | while(t && *t && len--){ |
116 | while(t && *t && len--){ |
91 | int c = *t; |
117 | int c = *t; |
92 | if (c=='<' || c=='>' || c=='&') { |
118 | if (c=='<' || c=='>' || c=='&') { |
93 | write(htmlfd, txt, t - txt); |
119 | html_raw(txt, t - txt); |
94 | if (c=='>') |
120 | if (c=='>') |
95 | html(">"); |
121 | html(">"); |
96 | else if (c=='<') |
122 | else if (c=='<') |
97 | html("<"); |
123 | html("<"); |
@@ -101,20 +127,20 @@ void html_ntxt(int len, char *txt) |
101 | } |
127 | } |
102 | t++; |
128 | t++; |
103 | } |
129 | } |
104 | if (t!=txt) |
130 | if (t!=txt) |
105 | write(htmlfd, txt, t - txt); |
131 | html_raw(txt, t - txt); |
106 | if (len<0) |
132 | if (len<0) |
107 | html("..."); |
133 | html("..."); |
108 | } |
134 | } |
109 | |
135 | |
110 | void html_attr(char *txt) |
136 | void html_attr(const char *txt) |
111 | { |
137 | { |
112 | char *t = txt; |
138 | const char *t = txt; |
113 | while(t && *t){ |
139 | while(t && *t){ |
114 | int c = *t; |
140 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
116 | write(htmlfd, txt, t - txt); |
142 | html_raw(txt, t - txt); |
117 | if (c=='>') |
143 | if (c=='>') |
118 | html(">"); |
144 | html(">"); |
119 | else if (c=='<') |
145 | else if (c=='<') |
120 | html("<"); |
146 | html("<"); |
@@ -129,50 +155,52 @@ void html_attr(char *txt) |
129 | if (t!=txt) |
155 | if (t!=txt) |
130 | html(txt); |
156 | html(txt); |
131 | } |
157 | } |
132 | |
158 | |
133 | void html_url_path(char *txt) |
159 | void html_url_path(const char *txt) |
134 | { |
160 | { |
135 | char *t = txt; |
161 | const char *t = txt; |
136 | while(t && *t){ |
162 | while(t && *t){ |
137 | int c = *t; |
163 | int c = *t; |
138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
164 | const char *e = url_escape_table[c]; |
139 | write(htmlfd, txt, t - txt); |
165 | if (e && c!='+' && c!='&' && c!='+') { |
140 | write(htmlfd, fmt("%%%2x", c), 3); |
166 | html_raw(txt, t - txt); |
| |
167 | html_raw(e, 3); |
141 | txt = t+1; |
168 | txt = t+1; |
142 | } |
169 | } |
143 | t++; |
170 | t++; |
144 | } |
171 | } |
145 | if (t!=txt) |
172 | if (t!=txt) |
146 | html(txt); |
173 | html(txt); |
147 | } |
174 | } |
148 | |
175 | |
149 | void html_url_arg(char *txt) |
176 | void html_url_arg(const char *txt) |
150 | { |
177 | { |
151 | char *t = txt; |
178 | const char *t = txt; |
152 | while(t && *t){ |
179 | while(t && *t){ |
153 | int c = *t; |
180 | int c = *t; |
154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
181 | const char *e = url_escape_table[c]; |
155 | write(htmlfd, txt, t - txt); |
182 | if (e) { |
156 | write(htmlfd, fmt("%%%2x", c), 3); |
183 | html_raw(txt, t - txt); |
| |
184 | html_raw(e, 3); |
157 | txt = t+1; |
185 | txt = t+1; |
158 | } |
186 | } |
159 | t++; |
187 | t++; |
160 | } |
188 | } |
161 | if (t!=txt) |
189 | if (t!=txt) |
162 | html(txt); |
190 | html(txt); |
163 | } |
191 | } |
164 | |
192 | |
165 | void html_hidden(char *name, char *value) |
193 | void html_hidden(const char *name, const char *value) |
166 | { |
194 | { |
167 | html("<input type='hidden' name='"); |
195 | html("<input type='hidden' name='"); |
168 | html_attr(name); |
196 | html_attr(name); |
169 | html("' value='"); |
197 | html("' value='"); |
170 | html_attr(value); |
198 | html_attr(value); |
171 | html("'/>"); |
199 | html("'/>"); |
172 | } |
200 | } |
173 | |
201 | |
174 | void html_option(char *value, char *text, char *selected_value) |
202 | void html_option(const char *value, const char *text, const char *selected_value) |
175 | { |
203 | { |
176 | html("<option value='"); |
204 | html("<option value='"); |
177 | html_attr(value); |
205 | html_attr(value); |
178 | html("'"); |
206 | html("'"); |
@@ -182,9 +210,9 @@ void html_option(char *value, char *text, char *selected_value) |
182 | html_txt(text); |
210 | html_txt(text); |
183 | html("</option>\n"); |
211 | html("</option>\n"); |
184 | } |
212 | } |
185 | |
213 | |
186 | void html_link_open(char *url, char *title, char *class) |
214 | void html_link_open(const char *url, const char *title, const char *class) |
187 | { |
215 | { |
188 | html("<a href='"); |
216 | html("<a href='"); |
189 | html_attr(url); |
217 | html_attr(url); |
190 | if (title) { |
218 | if (title) { |
@@ -220,9 +248,9 @@ int html_include(const char *filename) |
220 | filename, strerror(errno), errno); |
248 | filename, strerror(errno), errno); |
221 | return -1; |
249 | return -1; |
222 | } |
250 | } |
223 | while((len = fread(buf, 1, 4096, f)) > 0) |
251 | while((len = fread(buf, 1, 4096, f)) > 0) |
224 | write(htmlfd, buf, len); |
252 | html_raw(buf, len); |
225 | fclose(f); |
253 | fclose(f); |
226 | return 0; |
254 | return 0; |
227 | } |
255 | } |
228 | |
256 | |
@@ -257,16 +285,16 @@ char *convert_query_hexchar(char *txt) |
257 | return txt; |
285 | return txt; |
258 | } |
286 | } |
259 | } |
287 | } |
260 | |
288 | |
261 | int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) |
289 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
262 | { |
290 | { |
263 | char *t, *value = NULL, c; |
291 | char *t, *txt, *value = NULL, c; |
264 | |
292 | |
265 | if (!txt) |
293 | if (!txt_) |
266 | return 0; |
294 | return 0; |
267 | |
295 | |
268 | t = txt = strdup(txt); |
296 | t = txt = strdup(txt_); |
269 | if (t == NULL) { |
297 | if (t == NULL) { |
270 | printf("Out of memory\n"); |
298 | printf("Out of memory\n"); |
271 | exit(1); |
299 | exit(1); |
272 | } |
300 | } |
|