summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJaePil Jung <jjp5023@gmail.com>2018-09-13 04:17:17 +0900
committerRyan Dahl <ry@tinyclouds.org>2018-09-12 15:17:17 -0400
commit5bea62ac321c33ee8a65d02e14d101f035589fb3 (patch)
tree9fc62dd4b1ae81457b575c8bb8b8130ee2a71081 /src
parent41c70b154f4dd9adf6df875c653bcf8701511ff0 (diff)
Small handers.rs cleanup (#735)
Diffstat (limited to 'src')
-rw-r--r--src/handlers.rs19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/handlers.rs b/src/handlers.rs
index 326c2f2dd..641bfd83c 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -420,7 +420,7 @@ fn handle_make_temp_dir(d: *const DenoC, base: &msg::Base) -> Box<Op> {
let deno = from_c(d);
if !deno.flags.allow_write {
- return Box::new(futures::future::err(permission_denied()));
+ return odd_future(permission_denied());
}
// TODO Use blocking() here.
Box::new(futures::future::result(|| -> OpResult {
@@ -590,16 +590,15 @@ fn handle_write_file(d: *const DenoC, base: &msg::Base) -> Box<Op> {
let filename = String::from(msg.filename().unwrap());
let data = msg.data().unwrap();
let perm = msg.perm();
- let deno = from_c(d);
- debug!("handle_write_file {}", filename);
+ let deno = from_c(d);
+ if !deno.flags.allow_write {
+ return odd_future(permission_denied());
+ }
Box::new(futures::future::result(|| -> OpResult {
- if !deno.flags.allow_write {
- Err(permission_denied())
- } else {
- deno_fs::write_file(Path::new(&filename), data, perm)?;
- Ok(None)
- }
+ debug!("handle_write_file {}", filename);
+ deno_fs::write_file(Path::new(&filename), data, perm)?;
+ Ok(None)
}()))
}
@@ -664,7 +663,7 @@ fn handle_rename(d: *const DenoC, base: &msg::Base) -> Box<Op> {
let deno = from_c(d);
if !deno.flags.allow_write {
return odd_future(permission_denied());
- }
+ };
let msg = base.msg_as_rename().unwrap();
let oldpath = String::from(msg.oldpath().unwrap());
let newpath = String::from(msg.newpath().unwrap());