Merge branch 'master' into ptrace

Author: marmistrz

.travis.yml

@@ -49,7 +49,8 @@ matrix:
       rust: 1.13.0
     - env: TARGET=arm-unknown-linux-gnueabi
       rust: 1.13.0
-    # - env: TARGET=arm-unknown-linux-musleabi
+    - env: TARGET=arm-unknown-linux-musleabi
+      rust: 1.14.0
     - env: TARGET=armv7-unknown-linux-gnueabihf
       rust: 1.13.0
     - env: TARGET=i686-unknown-linux-gnu
@@ -58,8 +59,10 @@ matrix:
       rust: 1.13.0
     - env: TARGET=mips-unknown-linux-gnu
       rust: 1.13.0
-    # - env: TARGET=mips64-unknown-linux-gnuabi64
-    # - env: TARGET=mips64el-unknown-linux-gnuabi64
+    - env: TARGET=mips64-unknown-linux-gnuabi64
+      rust: 1.13.0
+    - env: TARGET=mips64el-unknown-linux-gnuabi64
+      rust: 1.13.0
     - env: TARGET=mipsel-unknown-linux-gnu
       rust: 1.13.0
     - env: TARGET=powerpc-unknown-linux-gnu
@@ -68,7 +71,8 @@ matrix:
       rust: 1.13.0
     - env: TARGET=powerpc64le-unknown-linux-gnu
       rust: 1.13.0
-    # - env: TARGET=s390x-unknown-linux-gnu
+    - env: TARGET=s390x-unknown-linux-gnu
+      rust: 1.13.0
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: 1.13.0
     - env: TARGET=x86_64-unknown-linux-musl
@@ -121,6 +125,16 @@ matrix:
       rust: 1.13.0
       os: osx
 
+    # Planning to add these targets, but they can fail for now
+    - env: TARGET=mips64-unknown-linux-gnuabi64
+      rust: 1.13.0
+    - env: TARGET=mips64el-unknown-linux-gnuabi64
+      rust: 1.13.0
+    - env: TARGET=arm-unknown-linux-musleabi
+      rust: 1.14.0
+    - env: TARGET=s390x-unknown-linux-gnu
+      rust: 1.13.0
+
     # Failures for nightlies may be because of compiler bugs, so don't fail the
     # build if these fail.
     - env: TARGET=x86_64-unknown-linux-gnu

CHANGELOG.md

@@ -39,6 +39,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   respectively. Various functions have been changed to use these new types as
   arguments. ([#629](https://github.com/nix-rust/nix/pull/629))
 - Promoted all Android targets to Tier 2 support
+- `nix::sys::statfs::{statfs,fstatfs}` uses statfs definition from `libc::statfs` instead of own linux specific type `nix::sys::Statfs`.
+  Also file system type constants like `nix::sys::statfs::ADFS_SUPER_MAGIC` were removed in favor of the libc equivalent.
+  ([#561](https://github.com/nix-rust/nix/pull/561))
 
 ### Removed
 - Removed io::Error from nix::Error and conversion from nix::Error to Errno
@@ -54,6 +57,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   `Android` ([#631](https://github.com/nix-rust/nix/pull/631)).
 - `bind` and `errno_location` now work correctly on `Android`
   ([#631](https://github.com/nix-rust/nix/pull/631))
+- Added `nix::ptrace` on all Linux-kernel-based platforms
+  [#624](https://github.com/nix-rust/nix/pull/624). Previously it was
+  only available on x86, x86-64, and ARM, and also not on Android.
 
 ## [0.8.1] 2017-04-16
 

Cargo.toml

@@ -2,7 +2,7 @@
 
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
-version     = "0.8.1-pre"
+version     = "0.9.0-pre"
 authors     = ["The nix-rust Project Developers"]
 homepage    = "https://github.com/nix-rust/nix"
 repository  = "https://github.com/nix-rust/nix"
@@ -22,7 +22,7 @@ preadv_pwritev = []
 signalfd = []
 
 [dependencies]
-libc = { git = "https://github.com/rust-lang/libc" }
+libc = "0.2.25"
 bitflags = "0.9"
 cfg-if = "0.1.0"
 void = "1.0.2"

README.md

@@ -26,8 +26,8 @@ call:
 // libc api (unsafe, requires handling return code/errno)
 pub unsafe extern fn gethostname(name: *mut c_char, len: size_t) -> c_int;
 
-// nix api (returns a nix::Result)
-pub fn gethostname(name: &mut [u8]) -> Result<()>;
+// nix api (returns a nix::Result<CStr>)
+pub fn gethostname<'a>(buffer: &'a mut [u8]) -> Result<&'a CStr>;
 ```
 
 ## Supported Platforms
@@ -77,9 +77,13 @@ Tier 2:
 
 Tier 3:
   * aarch64-apple-ios
+  * arm-unknown-linux-musleabi (requires Rust >= 1.14)
   * armv7-apple-ios
   * armv7s-apple-ios
   * i386-apple-ios
+  * mips64-unknown-linux-gnuabi64
+  * mips64el-unknown-linux-gnuabi64
+  * s390x-unknown-linux-gnu
   * x86_64-apple-ios
 
 ## Usage

src/sys/ioctl/platform/linux.rs

@@ -1,7 +1,7 @@
 pub const NRBITS: u32 = 8;
 pub const TYPEBITS: u32 = 8;
 
-#[cfg(any(target_arch = "mips", target_arch = "powerpc", target_arch = "powerpc64"))]
+#[cfg(any(target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64"))]
 mod consts {
     pub const NONE: u8 = 1;
     pub const READ: u8 = 2;
@@ -12,16 +12,19 @@ mod consts {
 
 #[cfg(not(any(target_arch = "powerpc",
               target_arch = "mips",
+              target_arch = "mips64",
               target_arch = "x86",
               target_arch = "arm",
               target_arch = "x86_64",
               target_arch = "powerpc64",
+              target_arch = "s390x",
               target_arch = "aarch64")))]
 use this_arch_not_supported;
 
 // "Generic" ioctl protocol
 #[cfg(any(target_arch = "x86",
           target_arch = "arm",
+          target_arch = "s390x",
           target_arch = "x86_64",
           target_arch = "aarch64"))]
 mod consts {

src/sys/mod.rs

@@ -52,11 +52,7 @@ pub mod uio;
 
 pub mod time;
 
-#[cfg(all(target_os = "linux",
-          any(target_arch = "x86",
-              target_arch = "x86_64",
-              target_arch = "arm")),
-          )]
+#[cfg(any(target_os = "linux", target_os = "android"))]
 pub mod ptrace;
 
 pub mod select;

src/sys/ptrace.rs

@@ -5,11 +5,6 @@ use ::unistd::Pid;
 
 //------------------ First part: a low-level wrapper for ptrace -----------------//
 
-#[cfg(all(target_os = "linux",
-          any(target_arch = "x86",
-              target_arch = "x86_64",
-              target_arch = "arm")),
-          )]
 pub mod ptrace {
     use libc::c_int;
 

src/sys/signal.rs

@@ -32,7 +32,7 @@ pub enum Signal {
     SIGPIPE = libc::SIGPIPE,
     SIGALRM = libc::SIGALRM,
     SIGTERM = libc::SIGTERM,
-    #[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(target_arch = "mips")))]
+    #[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(any(target_arch = "mips", target_arch = "mips64"))))]
     SIGSTKFLT = libc::SIGSTKFLT,
     SIGCHLD = libc::SIGCHLD,
     SIGCONT = libc::SIGCONT,
@@ -58,7 +58,7 @@ pub enum Signal {
 
 pub use self::Signal::*;
 
-#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(target_arch = "mips")))]
+#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), not(any(target_arch = "mips", target_arch = "mips64"))))]
 const SIGNALS: [Signal; 31] = [
     SIGHUP,
     SIGINT,
@@ -91,7 +91,7 @@ const SIGNALS: [Signal; 31] = [
     SIGIO,
     SIGPWR,
     SIGSYS];
-#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), target_arch = "mips"))]
+#[cfg(all(any(target_os = "linux", target_os = "android", target_os = "emscripten"), any(target_arch = "mips", target_arch = "mips64")))]
 const SIGNALS: [Signal; 30] = [
     SIGHUP,
     SIGINT,

src/sys/stat.rs

@@ -7,16 +7,6 @@ use libc::{self, mode_t};
 use std::mem;
 use std::os::unix::io::RawFd;
 
-mod ffi {
-    use libc::{c_char, c_int, mode_t, dev_t};
-    pub use libc::{stat, fstat, lstat};
-
-    extern {
-        pub fn mknod(pathname: *const c_char, mode: mode_t, dev: dev_t) -> c_int;
-        pub fn umask(mask: mode_t) -> mode_t;
-    }
-}
-
 libc_bitflags!(
     pub flags SFlag: mode_t {
         S_IFIFO,
@@ -56,7 +46,7 @@ bitflags! {
 pub fn mknod<P: ?Sized + NixPath>(path: &P, kind: SFlag, perm: Mode, dev: dev_t) -> Result<()> {
     let res = try!(path.with_nix_path(|cstr| {
         unsafe {
-            ffi::mknod(cstr.as_ptr(), kind.bits | perm.bits() as mode_t, dev)
+            libc::mknod(cstr.as_ptr(), kind.bits | perm.bits() as mode_t, dev)
         }
     }));
 
@@ -84,15 +74,15 @@ pub fn makedev(major: u64, minor: u64) -> dev_t {
 }
 
 pub fn umask(mode: Mode) -> Mode {
-    let prev = unsafe { ffi::umask(mode.bits() as mode_t) };
+    let prev = unsafe { libc::umask(mode.bits() as mode_t) };
     Mode::from_bits(prev).expect("[BUG] umask returned invalid Mode")
 }
 
 pub fn stat<P: ?Sized + NixPath>(path: &P) -> Result<FileStat> {
     let mut dst = unsafe { mem::uninitialized() };
     let res = try!(path.with_nix_path(|cstr| {
         unsafe {
-            ffi::stat(cstr.as_ptr(), &mut dst as *mut FileStat)
+            libc::stat(cstr.as_ptr(), &mut dst as *mut FileStat)
         }
     }));
 
@@ -105,7 +95,7 @@ pub fn lstat<P: ?Sized + NixPath>(path: &P) -> Result<FileStat> {
     let mut dst = unsafe { mem::uninitialized() };
     let res = try!(path.with_nix_path(|cstr| {
         unsafe {
-            ffi::lstat(cstr.as_ptr(), &mut dst as *mut FileStat)
+            libc::lstat(cstr.as_ptr(), &mut dst as *mut FileStat)
         }
     }));
 
@@ -116,7 +106,7 @@ pub fn lstat<P: ?Sized + NixPath>(path: &P) -> Result<FileStat> {
 
 pub fn fstat(fd: RawFd) -> Result<FileStat> {
     let mut dst = unsafe { mem::uninitialized() };
-    let res = unsafe { ffi::fstat(fd, &mut dst as *mut FileStat) };
+    let res = unsafe { libc::fstat(fd, &mut dst as *mut FileStat) };
 
     try!(Errno::result(res));
 

src/sys/statfs.rs

@@ -1,116 +1,21 @@
 use {Errno, Result, NixPath};
 use std::os::unix::io::AsRawFd;
+use libc;
 
-pub mod vfs {
-    #[cfg(target_pointer_width = "32")]
-    pub mod hwdep {
-        use libc::{c_uint};
-        pub type FsType = c_uint;
-        pub type BlockSize = c_uint;
-        pub type NameLen = c_uint;
-        pub type FragmentSize = c_uint;
-        pub type SwordType = c_uint;
-    }
-
-    #[cfg(target_pointer_width = "64")]
-    pub mod hwdep {
-        use libc::{c_long};
-        pub type FsType = c_long;
-        pub type BlockSize = c_long;
-        pub type NameLen = c_long;
-        pub type FragmentSize = c_long;
-        pub type SwordType = c_long;
-    }
-
-    use sys::statfs::vfs::hwdep::*;
-
-    #[repr(C)]
-    #[derive(Debug,Copy,Clone)]
-    pub struct Statfs {
-        pub f_type:  FsType,
-        pub f_bsize: BlockSize,
-        pub f_blocks: u64,
-        pub f_bfree: u64,
-        pub f_bavail: u64,
-        pub f_files: u64,
-        pub f_ffree: u64,
-        pub f_fsid: u64,
-        pub f_namelen: NameLen,
-        pub f_frsize: FragmentSize,
-        pub f_spare: [SwordType; 5],
-    }
-
-    pub const ADFS_SUPER_MAGIC : FsType =      0xadf5;
-    pub const AFFS_SUPER_MAGIC : FsType =      0xADFF;
-    pub const BEFS_SUPER_MAGIC : FsType =      0x42465331;
-    pub const BFS_MAGIC : FsType =             0x1BADFACE;
-    pub const CIFS_MAGIC_NUMBER : FsType =     0xFF534D42;
-    pub const CODA_SUPER_MAGIC : FsType =      0x73757245;
-    pub const COH_SUPER_MAGIC : FsType =       0x012FF7B7;
-    pub const CRAMFS_MAGIC : FsType =          0x28cd3d45;
-    pub const DEVFS_SUPER_MAGIC : FsType =     0x1373;
-    pub const EFS_SUPER_MAGIC : FsType =       0x00414A53;
-    pub const EXT_SUPER_MAGIC : FsType =       0x137D;
-    pub const EXT2_OLD_SUPER_MAGIC : FsType =  0xEF51;
-    pub const EXT2_SUPER_MAGIC : FsType =      0xEF53;
-    pub const EXT3_SUPER_MAGIC : FsType =      0xEF53;
-    pub const EXT4_SUPER_MAGIC : FsType =      0xEF53;
-    pub const HFS_SUPER_MAGIC : FsType =       0x4244;
-    pub const HPFS_SUPER_MAGIC : FsType =      0xF995E849;
-    pub const HUGETLBFS_MAGIC : FsType =       0x958458f6;
-    pub const ISOFS_SUPER_MAGIC : FsType =     0x9660;
-    pub const JFFS2_SUPER_MAGIC : FsType =     0x72b6;
-    pub const JFS_SUPER_MAGIC : FsType =       0x3153464a;
-    pub const MINIX_SUPER_MAGIC : FsType =     0x137F; /* orig. minix */
-    pub const MINIX_SUPER_MAGIC2 : FsType =    0x138F; /* 30 char minix */
-    pub const MINIX2_SUPER_MAGIC : FsType =    0x2468; /* minix V2 */
-    pub const MINIX2_SUPER_MAGIC2 : FsType =   0x2478; /* minix V2, 30 char names */
-    pub const MSDOS_SUPER_MAGIC : FsType =     0x4d44;
-    pub const NCP_SUPER_MAGIC : FsType =       0x564c;
-    pub const NFS_SUPER_MAGIC : FsType =       0x6969;
-    pub const NTFS_SB_MAGIC : FsType =         0x5346544e;
-    pub const OPENPROM_SUPER_MAGIC : FsType =  0x9fa1;
-    pub const PROC_SUPER_MAGIC : FsType =      0x9fa0;
-    pub const QNX4_SUPER_MAGIC : FsType =      0x002f;
-    pub const REISERFS_SUPER_MAGIC : FsType =  0x52654973;
-    pub const ROMFS_MAGIC : FsType =           0x7275;
-    pub const SMB_SUPER_MAGIC : FsType =       0x517B;
-    pub const SYSV2_SUPER_MAGIC : FsType =     0x012FF7B6;
-    pub const SYSV4_SUPER_MAGIC : FsType =     0x012FF7B5;
-    pub const TMPFS_MAGIC : FsType =           0x01021994;
-    pub const UDF_SUPER_MAGIC : FsType =       0x15013346;
-    pub const UFS_MAGIC : FsType =             0x00011954;
-    pub const USBDEVICE_SUPER_MAGIC : FsType = 0x9fa2;
-    pub const VXFS_SUPER_MAGIC : FsType =      0xa501FCF5;
-    pub const XENIX_SUPER_MAGIC : FsType =     0x012FF7B4;
-    pub const XFS_SUPER_MAGIC : FsType =       0x58465342;
-    pub const _XIAFS_SUPER_MAGIC : FsType =    0x012FD16D;
-}
-
-mod ffi {
-    use libc::{c_int,c_char};
-    use sys::statfs::vfs;
-
-    extern {
-        pub fn statfs(path: * const c_char, buf: *mut vfs::Statfs) -> c_int;
-        pub fn fstatfs(fd: c_int, buf: *mut vfs::Statfs) -> c_int;
-    }
-}
-
-pub fn statfs<P: ?Sized + NixPath>(path: &P, stat: &mut vfs::Statfs) -> Result<()> {
+pub fn statfs<P: ?Sized + NixPath>(path: &P, stat: &mut libc::statfs) -> Result<()> {
     unsafe {
         Errno::clear();
         let res = try!(
-            path.with_nix_path(|path| ffi::statfs(path.as_ptr(), stat))
+            path.with_nix_path(|path| libc::statfs(path.as_ptr(), stat))
         );
 
         Errno::result(res).map(drop)
     }
 }
 
-pub fn fstatfs<T: AsRawFd>(fd: &T, stat: &mut vfs::Statfs) -> Result<()> {
+pub fn fstatfs<T: AsRawFd>(fd: &T, stat: &mut libc::statfs) -> Result<()> {
     unsafe {
         Errno::clear();
-        Errno::result(ffi::fstatfs(fd.as_raw_fd(), stat)).map(drop)
+        Errno::result(libc::fstatfs(fd.as_raw_fd(), stat)).map(drop)
     }
 }