Commit 17dc2f24468004aff3039e5601e85bea1f789fac
2024-09-11T16:31:32
wip httpd
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
diff --git a/http/http_request.c b/http/http_request.c
index 5a461d9..051a2e2 100644
--- a/http/http_request.c
+++ b/http/http_request.c
@@ -19,27 +19,14 @@ const s_sym ** http_request_buf_parse_method (s_buf *buf,
const s_sym **dest)
{
s_tag allowed_methods;
- bool b;
+ s_list *m;
s_ident ident;
s_buf_save save;
s_str str;
- s_tag tag;
+ const s_sym *sym;
assert(buf);
assert(dest);
buf_save_init(buf, &save);
- if (! buf_read_until_1_into_str(buf, " ", &str)) {
- err_puts("http_request_buf_parse_method: no method");
- goto clean;
- }
- tag.type = TAG_SYM;
- tag.data.sym = sym_find(&str);
- str_clean(&str);
- if (! tag.data.sym) {
- err_write_1("http_request_buf_parse_method: method not found: ");
- err_inspect_str(&str);
- err_write_1("\n");
- goto restore;
- }
ident_init(&ident, sym_1("HTTP.Request"), sym_1("allowed_methods"));
if (! ident_get(&ident, &allowed_methods)) {
err_puts("http_request_buf_parse_method: missing"
@@ -51,23 +38,27 @@ const s_sym ** http_request_buf_parse_method (s_buf *buf,
" HTTP.Request.allowed_methods");
goto restore;
}
- if (! list_has((const s_list * const *) &allowed_methods.data.list,
- &tag, &b)) {
- err_puts("http_request_buf_parse_method: list_has");
- goto restore;
- }
- if (! b) {
- err_write_1("http_request_buf_parse_method: invalid method: ");
- err_inspect_sym(&tag.data.sym);
- err_write_1("\n");
- goto restore;
+ m = allowed_methods.data.list;
+ while (m) {
+ if (m->tag.type != TAG_SYM) {
+ err_puts("http_request_buf_parse_method: invalid"
+ " HTTP.Request.allowed_methods");
+ goto restore;
+ }
+ sym = m->tag.data.sym;
+ str_init_alloc(&str, sym->str.size + 1);
+ memcpy(str.free.pchar, sym->str.ptr.pchar, sym->str.size);
+ str.free.pchar[sym->str.size] = ' ';
+ str.free.pchar[sym->str.size + 1] = 0;
+ if (buf_read_str(buf, &str) > 0) {
+ *dest = sym;
+ buf_save_clean(buf, &save);
+ return dest;
+ }
+ m = list_next(m);
}
- *dest = tag.data.sym;
- buf_save_clean(buf, &save);
- return dest;
restore:
buf_save_restore_rpos(buf, &save);
- clean:
buf_save_clean(buf, &save);
return NULL;
}
diff --git a/lib/kc3/0.1/httpd.kc3 b/lib/kc3/0.1/httpd.kc3
index c360725..9c1ab7e 100644
--- a/lib/kc3/0.1/httpd.kc3
+++ b/lib/kc3/0.1/httpd.kc3
@@ -17,15 +17,13 @@ defmodule HTTPd do
def root_dir = "./static"
def load_directory = fn (dir) {
- if File.exists?(dir) do
- if File.is_directory?(dir) do
- files = File.list(dir)
- List.each(files, fn (file) {
- if (! Str.starts_with?(file, ".")) do
- load(dir + file)
- end
- })
- end
+ if File.exists?(dir) && File.is_directory?(dir) do
+ files = File.list(dir)
+ List.each(files, fn (file) {
+ if (! Str.starts_with?(file, ".")) do
+ load(dir + file)
+ end
+ })
end
}