T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix path_remove_directory on *nixes

Browse Source
This commit is contained in:
Jakub Konka
2019-09-17 22:34:32 +02:00
parent 30a4f73cce
commit 90f1cd5c96
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.rs
View File

@@ -165,7 +165,6 @@ cfg_if::cfg_if! {
match name { match name {
"path_rename_trailing_slashes" => true, "path_rename_trailing_slashes" => true,
"path_symlink_trailing_slashes" => true, "path_symlink_trailing_slashes" => true,
"remove_directory_trailing_slashes" => true,
_ => false, _ => false,
} }
} else { } else {

4
src/hostcalls_impl/fs.rs
View File

@@ -978,7 +978,9 @@ pub(crate) unsafe fn path_remove_directory(
let dirfd = wasi_ctx let dirfd = wasi_ctx
.get_fd_entry(dirfd, host::__WASI_RIGHT_PATH_REMOVE_DIRECTORY, 0) .get_fd_entry(dirfd, host::__WASI_RIGHT_PATH_REMOVE_DIRECTORY, 0)
.and_then(|fe| fe.fd_object.descriptor.as_file())?; .and_then(|fe| fe.fd_object.descriptor.as_file())?;
let resolved = path_get(dirfd, 0, path, false)?; let resolved = path_get(dirfd, 0, path, true)?;
log::debug!("path_remove_directory resolved={:?}", resolved);
hostcalls_impl::path_remove_directory(resolved) hostcalls_impl::path_remove_directory(resolved)
} }

1
src/hostcalls_impl/fs_helpers.rs
View File

@@ -5,6 +5,7 @@ use crate::{host, Error, Result};
use std::fs::File; use std::fs::File;
use std::path::{Component, Path}; use std::path::{Component, Path};
#[derive(Debug)]
pub(crate) struct PathGet { pub(crate) struct PathGet {
dirfd: File, dirfd: File,
path: String, path: String,