Proxmox-Port/nix
1
0
Fork 0
mirror of https://github.com/jiangcuo/nix.git synced 2026-01-22 13:46:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mount: Use bindings from libc instead of our own

Browse Source
This commit is contained in:
Brian Pearce 2016-04-16 15:21:25 -07:00
parent b7c2f881ae
commit 2f54367f3a
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mount.rs
View File

@ -1,4 +1,5 @@
use libc::{c_ulong, c_int};
use libc;
use {Errno, Result, NixPath};
bitflags!(
@ -48,23 +49,6 @@ bitflags!(
}
);
mod ffi {
use libc::{c_char, c_int, c_ulong, c_void};
extern {
pub fn mount(
source: *const c_char,
target: *const c_char,
fstype: *const c_char,
flags: c_ulong,
data: *const c_void) -> c_int;
pub fn umount(target: *const c_char) -> c_int;
pub fn umount2(target: *const c_char, flags: c_int) -> c_int;
}
}
pub fn mount<P1: ?Sized + NixPath, P2: ?Sized + NixPath, P3: ?Sized + NixPath, P4: ?Sized + NixPath>(
source: Option<&P1>,
target: &P2,
@ -79,7 +63,7 @@ pub fn mount<P1: ?Sized + NixPath, P2: ?Sized + NixPath, P3: ?Sized + NixPath, P
fstype.with_nix_path(|fstype| {
data.with_nix_path(|data| {
unsafe {
ffi::mount(source.as_ptr(),
libc::mount(source.as_ptr(),
target.as_ptr(),
fstype.as_ptr(),
flags.bits,
@ -95,7 +79,7 @@ pub fn mount<P1: ?Sized + NixPath, P2: ?Sized + NixPath, P3: ?Sized + NixPath, P
pub fn umount<P: ?Sized + NixPath>(target: &P) -> Result<()> {
let res = try!(target.with_nix_path(|cstr| {
unsafe { ffi::umount(cstr.as_ptr()) }
unsafe { libc::umount(cstr.as_ptr()) }
}));
Errno::result(res).map(drop)
@ -103,7 +87,7 @@ pub fn umount<P: ?Sized + NixPath>(target: &P) -> Result<()> {
pub fn umount2<P: ?Sized + NixPath>(target: &P, flags: MntFlags) -> Result<()> {
let res = try!(target.with_nix_path(|cstr| {
unsafe { ffi::umount2(cstr.as_ptr(), flags.bits) }
unsafe { libc::umount2(cstr.as_ptr(), flags.bits) }
}));
Errno::result(res).map(drop)