diff options
| author | Alejandro Soto <alejandro@34project.org> | 2022-01-04 00:58:06 -0600 |
|---|---|---|
| committer | Alejandro Soto <alejandro@34project.org> | 2022-01-04 00:58:06 -0600 |
| commit | 30a119364b8cf0bb26046232a7d8862c6afa2580 (patch) | |
| tree | eb7c86fa477f809162817250ed89fa5bd07cb5d1 /src/fuse/mount.rs | |
| parent | 32958e3116c6afe91d4b358c310737e2619e49b1 (diff) | |
Remove usermount_fd
Diffstat (limited to '')
| -rw-r--r-- | src/fuse/mount.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/fuse/mount.rs b/src/fuse/mount.rs index 6464372..9b03961 100644 --- a/src/fuse/mount.rs +++ b/src/fuse/mount.rs @@ -3,7 +3,7 @@ use std::{ io, os::unix::{ ffi::OsStrExt, - io::{AsRawFd, IntoRawFd, RawFd}, + io::{AsRawFd, RawFd}, net::UnixStream, }, process::Command, @@ -114,7 +114,12 @@ where let mut command = Command::new("fusermount3"); if !options.0.is_empty() { - command.args(&[OsStr::new("-o"), &options.0, mountpoint.as_ref()]); + command.args(&[ + OsStr::new("-o"), + &options.0, + OsStr::new("--"), + mountpoint.as_ref(), + ]); } else { command.arg(mountpoint); }; @@ -143,12 +148,7 @@ where })(); match session_fd { - Ok(session_fd) => { - let fusermount_fd = DumbFd(left_side.into_raw_fd()); - let session_fd = DumbFd(session_fd); - - Ok(Start::new(fusermount_fd, session_fd)) - } + Ok(session_fd) => Ok(Start::new(DumbFd(session_fd))), Err(error) => { drop(left_side); |
