diff options
author | Kevin (Kun) "Kassimo" Qian <kevinkassimo@gmail.com> | 2018-09-17 16:53:55 -0700 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2018-09-17 16:53:55 -0700 |
commit | e3d634eb218f48b7152b40d64b07ff2f0a58ca09 (patch) | |
tree | 4a62ba1d804931fa7d687663c606b7edf7f16ae5 /src | |
parent | 82d0638139adb64ae634d3b304b1c44f7cb358ee (diff) |
Make mode always u32 and switch to has_mode for StatRes fbs (#761)
Diffstat (limited to 'src')
-rw-r--r-- | src/fs.rs | 2 | ||||
-rw-r--r-- | src/handlers.rs | 9 | ||||
-rw-r--r-- | src/msg.fbs | 4 |
3 files changed, 8 insertions, 7 deletions
@@ -80,7 +80,7 @@ pub fn mkdir(path: &Path, perm: u32) -> std::io::Result<()> { #[cfg(any(unix))] fn set_dir_permission(builder: &mut DirBuilder, perm: u32) { debug!("set dir perm to {}", perm); - builder.mode(perm); + builder.mode(perm & 0o777); } #[cfg(not(any(unix)))] diff --git a/src/handlers.rs b/src/handlers.rs index f13ecec9f..9c218827f 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -533,13 +533,13 @@ macro_rules! to_seconds { } #[cfg(any(unix))] -fn get_mode(perm: fs::Permissions) -> i32 { - (perm.mode() as i32) +fn get_mode(perm: fs::Permissions) -> u32 { + perm.mode() } #[cfg(not(any(unix)))] -fn get_mode(_perm: fs::Permissions) -> i32 { - -1 +fn get_mode(_perm: fs::Permissions) -> u32 { + 0 } fn handle_stat(_d: *const DenoC, base: &msg::Base) -> Box<Op> { @@ -568,6 +568,7 @@ fn handle_stat(_d: *const DenoC, base: &msg::Base) -> Box<Op> { accessed: to_seconds!(metadata.accessed()), created: to_seconds!(metadata.created()), mode: get_mode(metadata.permissions()), + has_mode: cfg!(target_family = "unix"), ..Default::default() }, ); diff --git a/src/msg.fbs b/src/msg.fbs index e80713236..37a48e2df 100644 --- a/src/msg.fbs +++ b/src/msg.fbs @@ -212,8 +212,8 @@ table StatRes { modified:ulong; accessed:ulong; created:ulong; - mode: int = -1; - // negative mode for invalid (Windows); default to invalid + mode: uint; + has_mode: bool; // false on windows } root_type Base; |