Move the remaining FFI definitions into libc

Fixes dlrobertson#18

Cargo.toml

@@ -19,7 +19,7 @@ targets = [
 ]
 
 [dependencies]
-libc = "0.2.20"
+libc = { git = "https://github.com/rust-lang/libc.git", rev = "d6fe782", features = [ "extra_traits" ] }
 
 [build-dependencies]
 version_check = "0.9.4"

src/fcntl.rs

@@ -53,7 +53,7 @@ impl FcntlRights {
     pub fn from_file<T: AsRawFd>(fd: &T) -> CapResult<FcntlRights> {
         unsafe {
             let mut empty_fcntls = 0;
-            let res = cap_fcntls_get(fd.as_raw_fd(), &mut empty_fcntls as *mut u32);
+            let res = libc::cap_fcntls_get(fd.as_raw_fd(), &mut empty_fcntls as *mut u32);
             if res < 0 {
                 Err(CapErr::from(CapErrType::Get))
             } else {
@@ -66,16 +66,11 @@ impl FcntlRights {
 impl CapRights for FcntlRights {
     fn limit<T: AsRawFd>(&self, fd: &T) -> CapResult<()> {
         unsafe {
-            if cap_fcntls_limit(fd.as_raw_fd(), self.0) < 0 {
+            if libc::cap_fcntls_limit(fd.as_raw_fd(), self.0) < 0 {
                 Err(CapErr::from(CapErrType::Get))
             } else {
                 Ok(())
             }
         }
     }
 }
-
-extern "C" {
-    fn cap_fcntls_limit(fd: i32, fcntlrights: u32) -> i32;
-    fn cap_fcntls_get(fd: i32, fcntlrightsp: *mut u32) -> i32;
-}

src/ioctl.rs

@@ -46,7 +46,7 @@ impl IoctlRights {
     pub fn from_file<T: AsRawFd>(fd: &T, len: usize) -> CapResult<IoctlRights> {
         unsafe {
             let mut cmds = Vec::with_capacity(len);
-            let res = cap_ioctls_get(fd.as_raw_fd(), cmds.as_mut_ptr(), len);
+            let res = libc::cap_ioctls_get(fd.as_raw_fd(), cmds.as_mut_ptr(), len);
             if res == CAP_IOCTLS_ALL {
                 todo!()
             } else if let Ok(rlen) = usize::try_from(res) {
@@ -67,16 +67,11 @@ impl CapRights for IoctlRights {
     fn limit<T: AsRawFd>(&self, fd: &T) -> CapResult<()> {
         unsafe {
             let len = self.0.len();
-            if cap_ioctls_limit(fd.as_raw_fd(), self.0.as_ptr(), len) < 0 {
+            if libc::cap_ioctls_limit(fd.as_raw_fd(), self.0.as_ptr(), len) < 0 {
                 Err(CapErr::from(CapErrType::Limit))
             } else {
                 Ok(())
             }
         }
     }
 }
-
-extern "C" {
-    fn cap_ioctls_limit(fd: i32, cmds: *const libc::u_long, ncmds: usize) -> i32;
-    fn cap_ioctls_get(fd: i32, cmds: *mut libc::u_long, maxcmds: usize) -> isize;
-}

src/process.rs

@@ -13,7 +13,7 @@ pub fn enter() -> io::Result<()> {
 }
 
 pub fn sandboxed() -> bool {
-    unsafe { cap_sandboxed() }
+    unsafe { libc::cap_sandboxed() }
 }
 
 pub fn get_mode() -> io::Result<usize> {
@@ -25,7 +25,3 @@ pub fn get_mode() -> io::Result<usize> {
     }
     Ok(mode as usize)
 }
-
-extern "C" {
-    fn cap_sandboxed() -> bool;
-}

src/right.rs

@@ -202,7 +202,7 @@ impl FileRights {
     pub fn from_file<T: AsRawFd>(fd: &T) -> CapResult<FileRights> {
         unsafe {
             let mut empty_rights = unsafe { mem::zeroed() };
-            let res = __cap_rights_get(
+            let res = libc::__cap_rights_get(
                 RIGHTS_VERSION,
                 fd.as_raw_fd(),
                 &mut empty_rights as *mut cap_rights_t,
@@ -294,10 +294,6 @@ impl CapRights for FileRights {
     }
 }
 
-extern "C" {
-    fn __cap_rights_get(version: i32, fd: RawFd, rightsp: *mut cap_rights_t) -> RawFd;
-}
-
 #[test]
 fn test_macros() {
     assert_eq!(cap_right!(0, 1), 144115188075855873u64);