LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-02 16:25:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWasm: Accept newly-created wasi file descriptors as well

Browse Source
This commit is contained in:
Ali Mohammad Pur 2023-05-04 01:30:52 +03:30 committed by Andreas Kling
parent a608e87ff9
commit f62187ed5d
Notes: sideshowbarker 2024-07-17 02:22:23 +09:00 
Author: https://github.com/alimpfard
Commit: https://github.com/SerenityOS/serenity/commit/f62187ed5d
Pull-request: https://github.com/SerenityOS/serenity/pull/18650
Reviewed-by: https://github.com/gmta
1 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Userland/Libraries/LibWasm/WASI/Wasi.cpp
View File

@ -515,14 +515,19 @@ ErrorOr<Result<FileStat>> Implementation::impl$path_filestat_get(Configuration&
auto dir_fd = AT_FDCWD;
auto mapped_fd = map_fd(fd);
if (mapped_fd.has<PreopenedDirectoryDescriptor>()) {
auto& entry = preopened_directories()[mapped_fd.get<PreopenedDirectoryDescriptor>().value()];
dir_fd = entry.opened_fd.value_or_lazy_evaluated([&] {
DeprecatedString path = entry.host_path.string();
return open(path.characters(), O_DIRECTORY, 0755);
});
entry.opened_fd = dir_fd;
}
mapped_fd.visit(
[&](PreopenedDirectoryDescriptor descriptor) {
auto& entry = preopened_directories()[descriptor.value()];
dir_fd = entry.opened_fd.value_or_lazy_evaluated([&] {
DeprecatedString path = entry.host_path.string();
return open(path.characters(), O_DIRECTORY, 0755);
});
entry.opened_fd = dir_fd;
},
[&](u32 fd) {
dir_fd = fd;
},
[](UnmappedDescriptor) {});
if (dir_fd < 0 && dir_fd != AT_FDCWD)
return errno_value_from_errno(errno);
@ -573,14 +578,19 @@ ErrorOr<Result<void>> Implementation::impl$path_create_directory(Configuration&
auto dir_fd = AT_FDCWD;
auto mapped_fd = map_fd(fd);
if (mapped_fd.has<PreopenedDirectoryDescriptor>()) {
auto& entry = preopened_directories()[mapped_fd.get<PreopenedDirectoryDescriptor>().value()];
dir_fd = entry.opened_fd.value_or_lazy_evaluated([&] {
DeprecatedString path = entry.host_path.string();
return open(path.characters(), O_DIRECTORY, 0755);
});
entry.opened_fd = dir_fd;
}
mapped_fd.visit(
[&](PreopenedDirectoryDescriptor descriptor) {
auto& entry = preopened_directories()[descriptor.value()];
dir_fd = entry.opened_fd.value_or_lazy_evaluated([&] {
DeprecatedString path = entry.host_path.string();
return open(path.characters(), O_DIRECTORY, 0755);
});
entry.opened_fd = dir_fd;
},
[&](u32 fd) {
dir_fd = fd;
},
[](UnmappedDescriptor) {});
if (dir_fd < 0 && dir_fd != AT_FDCWD)
return errno_value_from_errno(errno);
@ -599,14 +609,19 @@ ErrorOr<Result<FD>> Implementation::impl$path_open(Configuration& configuration,
auto dir_fd = AT_FDCWD;
auto mapped_fd = map_fd(fd);
if (mapped_fd.has<PreopenedDirectoryDescriptor>()) {
auto& entry = preopened_directories()[mapped_fd.get<PreopenedDirectoryDescriptor>().value()];
dir_fd = entry.opened_fd.value_or_lazy_evaluated([&] {
DeprecatedString path = entry.host_path.string();
return open(path.characters(), O_DIRECTORY, 0755);
});
entry.opened_fd = dir_fd;
}
mapped_fd.visit(
[&](PreopenedDirectoryDescriptor descriptor) {
auto& entry = preopened_directories()[descriptor.value()];
dir_fd = entry.opened_fd.value_or_lazy_evaluated([&] {
DeprecatedString path = entry.host_path.string();
return open(path.characters(), O_DIRECTORY, 0755);
});
entry.opened_fd = dir_fd;
},
[&](u32 fd) {
dir_fd = fd;
},
[](UnmappedDescriptor) {});
if (dir_fd < 0 && dir_fd != AT_FDCWD)
return errno_value_from_errno(errno);