|
diff --git a/html.c b/html.c index 6f31097..a0f6db4 100644 --- a/ html.c+++ b/ html.c |
|
@@ -261,62 +261,63 @@ int hextoint(char c) |
261 | if (c >= 'a' && c <= 'f') |
261 | if (c >= 'a' && c <= 'f') |
262 | return 10 + c - 'a'; |
262 | return 10 + c - 'a'; |
263 | else if (c >= 'A' && c <= 'F') |
263 | else if (c >= 'A' && c <= 'F') |
264 | return 10 + c - 'A'; |
264 | return 10 + c - 'A'; |
265 | else if (c >= '0' && c <= '9') |
265 | else if (c >= '0' && c <= '9') |
266 | return c - '0'; |
266 | return c - '0'; |
267 | else |
267 | else |
268 | return -1; |
268 | return -1; |
269 | } |
269 | } |
270 | |
270 | |
271 | char *convert_query_hexchar(char *txt) |
271 | char *convert_query_hexchar(char *txt) |
272 | { |
272 | { |
273 | int d1, d2, n; |
273 | int d1, d2, n; |
274 | n = strlen(txt); |
274 | n = strlen(txt); |
275 | if (n < 3) { |
275 | if (n < 3) { |
276 | *txt = '\0'; |
276 | *txt = '\0'; |
277 | return txt-1; |
277 | return txt-1; |
278 | } |
278 | } |
279 | d1 = hextoint(*(txt+1)); |
279 | d1 = hextoint(*(txt+1)); |
280 | d2 = hextoint(*(txt+2)); |
280 | d2 = hextoint(*(txt+2)); |
281 | if (d1<0 || d2<0) { |
281 | if (d1<0 || d2<0) { |
282 | memmove(txt, txt+3, n-2); |
282 | memmove(txt, txt+3, n-2); |
283 | return txt-1; |
283 | return txt-1; |
284 | } else { |
284 | } else { |
285 | *txt = d1 * 16 + d2; |
285 | *txt = d1 * 16 + d2; |
286 | memmove(txt+1, txt+3, n-2); |
286 | memmove(txt+1, txt+3, n-2); |
287 | return txt; |
287 | return txt; |
288 | } |
288 | } |
289 | } |
289 | } |
290 | |
290 | |
291 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
291 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
292 | { |
292 | { |
293 | char *t, *txt, *value = NULL, c; |
293 | char *o, *t, *txt, *value = NULL, c; |
294 | |
294 | |
295 | if (!txt_) |
295 | if (!txt_) |
296 | return 0; |
296 | return 0; |
297 | |
297 | |
298 | t = txt = strdup(txt_); |
298 | o = t = txt = strdup(txt_); |
299 | if (t == NULL) { |
299 | if (t == NULL) { |
300 | printf("Out of memory\n"); |
300 | printf("Out of memory\n"); |
301 | exit(1); |
301 | exit(1); |
302 | } |
302 | } |
303 | while((c=*t) != '\0') { |
303 | while((c=*t) != '\0') { |
304 | if (c=='=') { |
304 | if (c=='=') { |
305 | *t = '\0'; |
305 | *t = '\0'; |
306 | value = t+1; |
306 | value = t+1; |
307 | } else if (c=='+') { |
307 | } else if (c=='+') { |
308 | *t = ' '; |
308 | *t = ' '; |
309 | } else if (c=='%') { |
309 | } else if (c=='%') { |
310 | t = convert_query_hexchar(t); |
310 | t = convert_query_hexchar(t); |
311 | } else if (c=='&') { |
311 | } else if (c=='&') { |
312 | *t = '\0'; |
312 | *t = '\0'; |
313 | (*fn)(txt, value); |
313 | (*fn)(txt, value); |
314 | txt = t+1; |
314 | txt = t+1; |
315 | value = NULL; |
315 | value = NULL; |
316 | } |
316 | } |
317 | t++; |
317 | t++; |
318 | } |
318 | } |
319 | if (t!=txt) |
319 | if (t!=txt) |
320 | (*fn)(txt, value); |
320 | (*fn)(txt, value); |
| |
321 | free(o); |
321 | return 0; |
322 | return 0; |
322 | } |
323 | } |
|