Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# dev (202?-??-??) - ??
## Features/Changes

## Bug fixes
Runtime: fix caml_read_file_content

# 5.0.0 (2022-12-20) - Lille
## Features/Changes
* Compiler: add support for effect handlers (--enable=effects)
Expand Down
10 changes: 10 additions & 0 deletions lib/tests/test_sys.ml
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,13 @@ let%expect_test _ =
print_digest (Digest.channel c size);
[%expect {| 573705548ab0d6c8a2193579611511a2 |}];
()

let%expect_test _ =
print_digest (Digest.string content);
[%expect {| dd5da7fa373a2b2257d361aaf76845a0 |}];
let c = open_out_bin "/static/temp0" in
output_string c content;
close_out c;
let content' = Sys_js.read_file ~name:"/static/temp0" in
assert (content' = content);
[%expect {||}]
6 changes: 3 additions & 3 deletions runtime/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -322,17 +322,17 @@ function jsoo_create_file(name,content) {


//Provides: caml_read_file_content
//Requires: resolve_fs_device, caml_raise_no_such_file, caml_create_bytes, caml_string_of_bytes
//Requires: resolve_fs_device, caml_raise_no_such_file, caml_string_of_array
//Requires: caml_string_of_jsbytes, caml_jsbytes_of_string
function caml_read_file_content (name) {
var name = (typeof name == "string")?caml_string_of_jsbytes(name):name;
var root = resolve_fs_device(name);
if(root.device.exists(root.rest)) {
var file = root.device.open(root.rest,{rdonly:1});
var len = file.length();
var buf = caml_create_bytes(len);
var buf = new Uint8Array(len);
file.read(0,buf,0,len);
return caml_string_of_bytes(buf)
return caml_string_of_array(buf)
}
caml_raise_no_such_file(caml_jsbytes_of_string(name));
}