|
diff --git a/html.c b/html.c index 66ba65d..4033200 100644 --- a/ html.c+++ b/ html.c |
|
@@ -54,145 +54,145 @@ void htmlf(const char *format, ...) |
54 | vsnprintf(buf, sizeof(buf), format, args); |
54 | vsnprintf(buf, sizeof(buf), format, args); |
55 | va_end(args); |
55 | va_end(args); |
56 | html(buf); |
56 | html(buf); |
57 | } |
57 | } |
58 | |
58 | |
59 | void html_status(int code, const char *msg, int more_headers) |
59 | void html_status(int code, const char *msg, int more_headers) |
60 | { |
60 | { |
61 | htmlf("Status: %d %s\n", code, msg); |
61 | htmlf("Status: %d %s\n", code, msg); |
62 | if (!more_headers) |
62 | if (!more_headers) |
63 | html("\n"); |
63 | html("\n"); |
64 | } |
64 | } |
65 | |
65 | |
66 | void html_txt(char *txt) |
66 | void html_txt(const char *txt) |
67 | { |
67 | { |
68 | char *t = txt; |
68 | const 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, const char *txt) |
88 | { |
88 | { |
89 | char *t = txt; |
89 | const 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(const char *txt) |
111 | { |
111 | { |
112 | char *t = txt; |
112 | const char *t = txt; |
113 | while(t && *t){ |
113 | while(t && *t){ |
114 | int c = *t; |
114 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
115 | if (c=='<' || 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("'"); |
122 | html("'"); |
123 | else if (c=='"') |
123 | else if (c=='"') |
124 | html("""); |
124 | html("""); |
125 | txt = t+1; |
125 | txt = t+1; |
126 | } |
126 | } |
127 | t++; |
127 | t++; |
128 | } |
128 | } |
129 | if (t!=txt) |
129 | if (t!=txt) |
130 | html(txt); |
130 | html(txt); |
131 | } |
131 | } |
132 | |
132 | |
133 | void html_url_path(char *txt) |
133 | void html_url_path(const char *txt) |
134 | { |
134 | { |
135 | char *t = txt; |
135 | const char *t = txt; |
136 | while(t && *t){ |
136 | while(t && *t){ |
137 | int c = *t; |
137 | int c = *t; |
138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
139 | write(htmlfd, txt, t - txt); |
139 | write(htmlfd, txt, t - txt); |
140 | write(htmlfd, fmt("%%%2x", c), 3); |
140 | write(htmlfd, fmt("%%%2x", c), 3); |
141 | txt = t+1; |
141 | txt = t+1; |
142 | } |
142 | } |
143 | t++; |
143 | t++; |
144 | } |
144 | } |
145 | if (t!=txt) |
145 | if (t!=txt) |
146 | html(txt); |
146 | html(txt); |
147 | } |
147 | } |
148 | |
148 | |
149 | void html_url_arg(char *txt) |
149 | void html_url_arg(const char *txt) |
150 | { |
150 | { |
151 | char *t = txt; |
151 | const char *t = txt; |
152 | while(t && *t){ |
152 | while(t && *t){ |
153 | int c = *t; |
153 | int c = *t; |
154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
155 | write(htmlfd, txt, t - txt); |
155 | write(htmlfd, txt, t - txt); |
156 | write(htmlfd, fmt("%%%2x", c), 3); |
156 | write(htmlfd, fmt("%%%2x", c), 3); |
157 | txt = t+1; |
157 | txt = t+1; |
158 | } |
158 | } |
159 | t++; |
159 | t++; |
160 | } |
160 | } |
161 | if (t!=txt) |
161 | if (t!=txt) |
162 | html(txt); |
162 | html(txt); |
163 | } |
163 | } |
164 | |
164 | |
165 | void html_hidden(char *name, char *value) |
165 | void html_hidden(const char *name, const char *value) |
166 | { |
166 | { |
167 | html("<input type='hidden' name='"); |
167 | html("<input type='hidden' name='"); |
168 | html_attr(name); |
168 | html_attr(name); |
169 | html("' value='"); |
169 | html("' value='"); |
170 | html_attr(value); |
170 | html_attr(value); |
171 | html("'/>"); |
171 | html("'/>"); |
172 | } |
172 | } |
173 | |
173 | |
174 | void html_option(char *value, char *text, char *selected_value) |
174 | void html_option(const char *value, const char *text, const char *selected_value) |
175 | { |
175 | { |
176 | html("<option value='"); |
176 | html("<option value='"); |
177 | html_attr(value); |
177 | html_attr(value); |
178 | html("'"); |
178 | html("'"); |
179 | if (selected_value && !strcmp(selected_value, value)) |
179 | if (selected_value && !strcmp(selected_value, value)) |
180 | html(" selected='selected'"); |
180 | html(" selected='selected'"); |
181 | html(">"); |
181 | html(">"); |
182 | html_txt(text); |
182 | html_txt(text); |
183 | html("</option>\n"); |
183 | html("</option>\n"); |
184 | } |
184 | } |
185 | |
185 | |
186 | void html_link_open(char *url, char *title, char *class) |
186 | void html_link_open(const char *url, const char *title, const char *class) |
187 | { |
187 | { |
188 | html("<a href='"); |
188 | html("<a href='"); |
189 | html_attr(url); |
189 | html_attr(url); |
190 | if (title) { |
190 | if (title) { |
191 | html("' title='"); |
191 | html("' title='"); |
192 | html_attr(title); |
192 | html_attr(title); |
193 | } |
193 | } |
194 | if (class) { |
194 | if (class) { |
195 | html("' class='"); |
195 | html("' class='"); |
196 | html_attr(class); |
196 | html_attr(class); |
197 | } |
197 | } |
198 | html("'>"); |
198 | html("'>"); |
@@ -248,32 +248,32 @@ char *convert_query_hexchar(char *txt) |
248 | d1 = hextoint(*(txt+1)); |
248 | d1 = hextoint(*(txt+1)); |
249 | d2 = hextoint(*(txt+2)); |
249 | d2 = hextoint(*(txt+2)); |
250 | if (d1<0 || d2<0) { |
250 | if (d1<0 || d2<0) { |
251 | strcpy(txt, txt+3); |
251 | strcpy(txt, txt+3); |
252 | return txt-1; |
252 | return txt-1; |
253 | } else { |
253 | } else { |
254 | *txt = d1 * 16 + d2; |
254 | *txt = d1 * 16 + d2; |
255 | strcpy(txt+1, txt+3); |
255 | strcpy(txt+1, txt+3); |
256 | return txt; |
256 | return txt; |
257 | } |
257 | } |
258 | } |
258 | } |
259 | |
259 | |
260 | int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) |
260 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
261 | { |
261 | { |
262 | char *t, *value = NULL, c; |
262 | char *t, *txt, *value = NULL, c; |
263 | |
263 | |
264 | if (!txt) |
264 | if (!txt_) |
265 | return 0; |
265 | return 0; |
266 | |
266 | |
267 | t = txt = strdup(txt); |
267 | t = txt = strdup(txt_); |
268 | if (t == NULL) { |
268 | if (t == NULL) { |
269 | printf("Out of memory\n"); |
269 | printf("Out of memory\n"); |
270 | exit(1); |
270 | exit(1); |
271 | } |
271 | } |
272 | while((c=*t) != '\0') { |
272 | while((c=*t) != '\0') { |
273 | if (c=='=') { |
273 | if (c=='=') { |
274 | *t = '\0'; |
274 | *t = '\0'; |
275 | value = t+1; |
275 | value = t+1; |
276 | } else if (c=='+') { |
276 | } else if (c=='+') { |
277 | *t = ' '; |
277 | *t = ' '; |
278 | } else if (c=='%') { |
278 | } else if (c=='%') { |
279 | t = convert_query_hexchar(t); |
279 | t = convert_query_hexchar(t); |
|