|
diff --git a/html.c b/html.c index a0f6db4..24a03a5 100644 --- a/ html.c+++ b/ html.c |
|
@@ -45,202 +45,204 @@ 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=='\"' || 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 | else if (c=='&') |
| |
152 | html("&"); |
151 | txt = t+1; |
153 | txt = t+1; |
152 | } |
154 | } |
153 | t++; |
155 | t++; |
154 | } |
156 | } |
155 | if (t!=txt) |
157 | if (t!=txt) |
156 | html(txt); |
158 | html(txt); |
157 | } |
159 | } |
158 | |
160 | |
159 | void html_url_path(const char *txt) |
161 | void html_url_path(const char *txt) |
160 | { |
162 | { |
161 | const char *t = txt; |
163 | const char *t = txt; |
162 | while(t && *t){ |
164 | while(t && *t){ |
163 | int c = *t; |
165 | int c = *t; |
164 | const char *e = url_escape_table[c]; |
166 | const char *e = url_escape_table[c]; |
165 | if (e && c!='+' && c!='&') { |
167 | if (e && c!='+' && c!='&') { |
166 | html_raw(txt, t - txt); |
168 | html_raw(txt, t - txt); |
167 | html(e); |
169 | html(e); |
168 | txt = t+1; |
170 | txt = t+1; |
169 | } |
171 | } |
170 | t++; |
172 | t++; |
171 | } |
173 | } |
172 | if (t!=txt) |
174 | if (t!=txt) |
173 | html(txt); |
175 | html(txt); |
174 | } |
176 | } |
175 | |
177 | |
176 | void html_url_arg(const char *txt) |
178 | void html_url_arg(const char *txt) |
177 | { |
179 | { |
178 | const char *t = txt; |
180 | const char *t = txt; |
179 | while(t && *t){ |
181 | while(t && *t){ |
180 | int c = *t; |
182 | int c = *t; |
181 | const char *e = url_escape_table[c]; |
183 | const char *e = url_escape_table[c]; |
182 | if (c == ' ') |
184 | if (c == ' ') |
183 | e = "+"; |
185 | e = "+"; |
184 | if (e) { |
186 | if (e) { |
185 | html_raw(txt, t - txt); |
187 | html_raw(txt, t - txt); |
186 | html(e); |
188 | html(e); |
187 | txt = t+1; |
189 | txt = t+1; |
188 | } |
190 | } |
189 | t++; |
191 | t++; |
190 | } |
192 | } |
191 | if (t!=txt) |
193 | if (t!=txt) |
192 | html(txt); |
194 | html(txt); |
193 | } |
195 | } |
194 | |
196 | |
195 | void html_hidden(const char *name, const char *value) |
197 | void html_hidden(const char *name, const char *value) |
196 | { |
198 | { |
197 | html("<input type='hidden' name='"); |
199 | html("<input type='hidden' name='"); |
198 | html_attr(name); |
200 | html_attr(name); |
199 | html("' value='"); |
201 | html("' value='"); |
200 | html_attr(value); |
202 | html_attr(value); |
201 | html("'/>"); |
203 | html("'/>"); |
202 | } |
204 | } |
203 | |
205 | |
204 | void html_option(const char *value, const char *text, const char *selected_value) |
206 | void html_option(const char *value, const char *text, const char *selected_value) |
205 | { |
207 | { |
206 | html("<option value='"); |
208 | html("<option value='"); |
207 | html_attr(value); |
209 | html_attr(value); |
208 | html("'"); |
210 | html("'"); |
209 | if (selected_value && !strcmp(selected_value, value)) |
211 | if (selected_value && !strcmp(selected_value, value)) |
210 | html(" selected='selected'"); |
212 | html(" selected='selected'"); |
211 | html(">"); |
213 | html(">"); |
212 | html_txt(text); |
214 | html_txt(text); |
213 | html("</option>\n"); |
215 | html("</option>\n"); |
214 | } |
216 | } |
215 | |
217 | |
216 | void html_link_open(const char *url, const char *title, const char *class) |
218 | void html_link_open(const char *url, const char *title, const char *class) |
217 | { |
219 | { |
218 | html("<a href='"); |
220 | html("<a href='"); |
219 | html_attr(url); |
221 | html_attr(url); |
220 | if (title) { |
222 | if (title) { |
221 | html("' title='"); |
223 | html("' title='"); |
222 | html_attr(title); |
224 | html_attr(title); |
223 | } |
225 | } |
224 | if (class) { |
226 | if (class) { |
225 | html("' class='"); |
227 | html("' class='"); |
226 | html_attr(class); |
228 | html_attr(class); |
227 | } |
229 | } |
228 | html("'>"); |
230 | html("'>"); |
229 | } |
231 | } |
230 | |
232 | |
231 | void html_link_close(void) |
233 | void html_link_close(void) |
232 | { |
234 | { |
233 | html("</a>"); |
235 | html("</a>"); |
234 | } |
236 | } |
235 | |
237 | |
236 | void html_fileperm(unsigned short mode) |
238 | void html_fileperm(unsigned short mode) |
237 | { |
239 | { |
238 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
240 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
239 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
241 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
240 | } |
242 | } |
241 | |
243 | |
242 | int html_include(const char *filename) |
244 | int html_include(const char *filename) |
243 | { |
245 | { |
244 | FILE *f; |
246 | FILE *f; |
245 | char buf[4096]; |
247 | char buf[4096]; |
246 | size_t len; |
248 | size_t len; |
|