Skip to content

Commit db910eb

Browse files
authored
WasmFS: Add missing JS library deps (#19503)
These were not noticed because we were including lots of JS code anyhow any time WasmFS is used. These fixes will unblock improvements to JS code size. Also change an integer from -0 to 0.
1 parent 00b10aa commit db910eb

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

src/library_wasmfs.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ FS.createPreloadedFile = FS_createPreloadedFile;
2020
'$readI53FromI64',
2121
'$FS_createPreloadedFile',
2222
'$FS_getMode',
23+
// For FS.readFile
24+
'$UTF8ArrayToString',
2325
#if FORCE_FILESYSTEM
2426
'$FS_modeStringToFlags',
2527
'malloc',

src/library_wasmfs_node.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ mergeInto(LibraryManager.library, {
5353
// Ignore closure type errors due to outdated readdirSync annotations, see
5454
// https://github.com/google/closure-compiler/pull/4093
5555
_wasmfs_node_readdir__docs: '/** @suppress {checkTypes} */',
56-
_wasmfs_node_readdir__deps: ['$wasmfsNodeConvertNodeCode'],
56+
_wasmfs_node_readdir__deps: [
57+
'$wasmfsNodeConvertNodeCode',
58+
'$withStackSave',
59+
'$stringToUTF8OnStack'
60+
],
5761
_wasmfs_node_readdir: function(path_p, vec) {
5862
let path = UTF8ToString(path_p);
5963
let entries;

src/library_wasmfs_opfs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ mergeInto(LibraryManager.library, {
148148
wasmfsOPFSProxyFinish(ctx);
149149
},
150150

151-
_wasmfs_opfs_get_entries__deps: ['$wasmfsOPFSProxyFinish'],
151+
_wasmfs_opfs_get_entries__deps: ['$wasmfsOPFSProxyFinish', '$withStackSave'],
152152
_wasmfs_opfs_get_entries: async function(ctx, dirID, entriesPtr, errPtr) {
153153
let dirHandle = wasmfsOPFSDirectoryHandles.get(dirID);
154154

system/lib/wasmfs/syscalls.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ int __syscall_ioctl(int fd, int request, ...) {
12851285
case TIOCGWINSZ:
12861286
case TIOCSWINSZ: {
12871287
// TTY operations that we do nothing for anyhow can just be ignored.
1288-
return -0;
1288+
return 0;
12891289
}
12901290
default: {
12911291
return -EINVAL; // not supported

0 commit comments

Comments
 (0)