simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-06 19:25:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use of_fd instead of_chan everywhere

Browse source
This commit is contained in:
craff 2022-12-09 03:26:44 -10:00
parent 915317438f
commit 462fbd661c
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Tiny_httpd_dir.ml
View file

@ -82,8 +82,8 @@ let vfs_of_dir (top:string) : vfs =
let contains f = Sys.file_exists (top // f) let contains f = Sys.file_exists (top // f)
let list_dir f = Sys.readdir (top // f) let list_dir f = Sys.readdir (top // f)
let read_file_content f = let read_file_content f =
let ic = open_in_bin (top // f) in let ic = Unix.(openfile (top // f) [O_RDONLY] 0) in
Tiny_httpd_stream.of_chan ic Tiny_httpd_stream.of_fd ic
let create f = let create f =
let oc = open_out_bin (top // f) in let oc = open_out_bin (top // f) in
let write = output oc in let write = output oc in
@ -398,4 +398,3 @@ module Embedded_fs = struct
end in (module M) end in (module M)
end end

8
src/Tiny_httpd_stream.ml
View file

@ -120,13 +120,13 @@ let of_string s : t =
of_bytes (Bytes.unsafe_of_string s) of_bytes (Bytes.unsafe_of_string s)
let with_file ?buf_size file f = let with_file ?buf_size file f =
let ic = open_in file in let ic = Unix.(openfile file [O_RDONLY] 0) in
try try
let x = f (of_chan ?buf_size ic) in let x = f (of_fd ?buf_size ic) in
close_in ic; Unix.close ic;
x x
with e -> with e ->
close_in_noerr ic; Unix.close ic;
raise e raise e
let read_all ?(buf=Buf.create()) (self:t) : string = let read_all ?(buf=Buf.create()) (self:t) : string =