Fix all remaining issues on DragonFly

Missing functions and missing constats.

Author: mneumann

libc-test/build.rs

@@ -14,11 +14,12 @@ fn main() {
     let apple = target.contains("apple");
     let musl = target.contains("musl");
     let freebsd = target.contains("freebsd");
+    let dragonfly = target.contains("dragonfly");
     let mips = target.contains("mips");
     let netbsd = target.contains("netbsd");
     let openbsd = target.contains("openbsd");
     let rumprun = target.contains("rumprun");
-    let bsdlike = freebsd || apple || netbsd || openbsd;
+    let bsdlike = freebsd || apple || netbsd || openbsd || dragonfly;
     let mut cfg = ctest::TestGenerator::new();
 
     // Pull in extra goodies on linux/mingw
@@ -103,7 +104,7 @@ fn main() {
         cfg.header("ifaddrs.h");
         cfg.header("sys/statvfs.h");
 
-        if !openbsd && !freebsd {
+        if !openbsd && !freebsd && !dragonfly {
             cfg.header("sys/quota.h");
         }
 
@@ -177,6 +178,12 @@ fn main() {
         cfg.header("sys/syscall.h");
     }
 
+    if dragonfly {
+        cfg.header("ufs/ufs/quota.h");
+        cfg.header("pthread_np.h");
+        cfg.header("sys/ioctl_compat.h");
+    }
+
     cfg.type_name(move |ty, is_struct| {
         match ty {
             // Just pass all these through, no need for a "struct" prefix
@@ -192,6 +199,9 @@ fn main() {
             // OSX calls this something else
             "sighandler_t" if bsdlike => "sig_t".to_string(),
 
+            // does not exist on DragonFly
+            "fflags_t" if dragonfly => "uint32_t".to_string(),
+
             t if t.ends_with("_t") => t.to_string(),
 
             // Windows uppercase structs don't have `struct` in front, there's a
@@ -321,7 +331,7 @@ fn main() {
             "strerror_r" if linux => true,   // actually xpg-something-or-other
 
             // typed 2nd arg on linux and android
-            "gettimeofday" if linux || android || freebsd || openbsd => true,
+            "gettimeofday" if linux || android || freebsd || openbsd || dragonfly => true,
 
             // not declared in newer android toolchains
             "getdtablesize" if android => true,

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -15,7 +15,7 @@ pub type blksize_t = u64;
 s! {
     pub struct dirent {
         pub d_fileno: ::ino_t,
-        pub d_namelen: u16,
+        pub d_namlen: u16,
         pub d_type: u8,
         __unused1: u8,
         __unused2: u32,
@@ -30,7 +30,3 @@ pub const PTHREAD_STACK_MIN: ::size_t = 1024;
 pub const KERN_PROC_PATHNAME: ::c_int = 9;
 pub const SIGSTKSZ: ::size_t = 40960;
 pub const MADV_INVAL: ::c_int = 10;
-
-extern {
-    pub fn __dfly_error() -> *const ::c_int;
-}

src/unix/bsd/freebsdlike/mod.rs

@@ -125,6 +125,7 @@ s! {
         pub l_pid: ::pid_t,
         pub l_type: ::c_short,
         pub l_whence: ::c_short,
+        #[cfg(not(target_os = "dragonfly"))]
         pub l_sysid: ::c_int,
     }
 
@@ -353,11 +354,17 @@ pub const POSIX_MADV_SEQUENTIAL: ::c_int = 2;
 pub const POSIX_MADV_WILLNEED: ::c_int = 3;
 pub const POSIX_MADV_DONTNEED: ::c_int = 4;
 
+#[cfg(not(target_os = "dragonfly"))]
 pub const POSIX_FADV_NORMAL: ::c_int = 0;
+#[cfg(not(target_os = "dragonfly"))]
 pub const POSIX_FADV_RANDOM: ::c_int = 1;
+#[cfg(not(target_os = "dragonfly"))]
 pub const POSIX_FADV_SEQUENTIAL: ::c_int = 2;
+#[cfg(not(target_os = "dragonfly"))]
 pub const POSIX_FADV_WILLNEED: ::c_int = 3;
+#[cfg(not(target_os = "dragonfly"))]
 pub const POSIX_FADV_DONTNEED: ::c_int = 4;
+#[cfg(not(target_os = "dragonfly"))]
 pub const POSIX_FADV_NOREUSE: ::c_int = 5;
 
 pub const _SC_IOV_MAX: ::c_int = 56;
@@ -408,14 +415,17 @@ pub const RLIMIT_NOFILE: ::c_int = 8;
 pub const RLIMIT_SBSIZE: ::c_int = 9;
 pub const RLIMIT_VMEM: ::c_int = 10;
 pub const RLIMIT_AS: ::c_int = RLIMIT_VMEM;
+#[cfg(not(target_os = "dragonfly"))]
 pub const RLIMIT_NPTS: ::c_int = 11;
+#[cfg(not(target_os = "dragonfly"))]
 pub const RLIMIT_SWAP: ::c_int = 12;
 
 pub const RLIM_NLIMITS: rlim_t = 13;
 pub const RLIM_INFINITY: rlim_t = 0x7fff_ffff_ffff_ffff;
 
 pub const RUSAGE_SELF: ::c_int = 0;
 pub const RUSAGE_CHILDREN: ::c_int = -1;
+#[cfg(not(target_os = "dragonfly"))]
 pub const RUSAGE_THREAD: ::c_int = 1;
 
 pub const MADV_NORMAL: ::c_int = 0;
@@ -428,6 +438,7 @@ pub const MADV_NOSYNC: ::c_int = 6;
 pub const MADV_AUTOSYNC: ::c_int = 7;
 pub const MADV_NOCORE: ::c_int = 8;
 pub const MADV_CORE: ::c_int = 9;
+#[cfg(not(target_os = "dragonfly"))]
 pub const MADV_PROTECT: ::c_int = 10;
 
 pub const MINCORE_INCORE: ::c_int =  0x1;
@@ -594,8 +605,12 @@ extern {
                            mibp: *mut ::c_int,
                            sizep: *mut ::size_t)
                            -> ::c_int;
+    #[cfg(not(target_os = "dragonfly"))]
     pub fn mprotect(addr: *const ::c_void, len: ::size_t, prot: ::c_int)
                     -> ::c_int;
+    #[cfg(target_os = "dragonfly")]
+    pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int)
+                    -> ::c_int;
     pub fn shm_open(name: *const ::c_char, oflag: ::c_int, mode: ::mode_t)
                     -> ::c_int;
     pub fn sysctl(name: *const ::c_int,
@@ -611,8 +626,13 @@ extern {
                         newp: *const ::c_void,
                         newlen: ::size_t)
                         -> ::c_int;
+    #[cfg(not(target_os = "dragonfly"))]
     pub fn clock_gettime(clk_id: ::c_int, tp: *mut ::timespec) -> ::c_int;
+    #[cfg(target_os = "dragonfly")]
+    pub fn clock_gettime(clk_id: ::uint64_t, tp: *mut ::timespec) -> ::c_int;
+
     pub fn pthread_set_name_np(tid: ::pthread_t, name: *const ::c_char);
+    #[cfg(not(target_os = "dragonfly"))]
     pub fn posix_fallocate(fd: ::c_int, offset: ::off_t,
                            len: ::off_t) -> ::c_int;
     pub fn sched_setscheduler(pid: ::pid_t, policy: ::c_int, param: *const sched_param) -> ::c_int;
@@ -626,9 +646,12 @@ extern {
                     sbytes: *mut ::off_t,
                     flags: ::c_int) -> ::c_int;
 
+    #[cfg(not(target_os = "dragonfly"))]
     pub fn posix_fadvise(fd: ::c_int, offset: ::off_t, len: ::off_t, 
                          advise: ::c_int) -> ::c_int;
+    #[cfg(not(target_os = "dragonfly"))]
     pub fn mkostemp(template: *mut ::c_char, flags: ::c_int) -> ::c_int;
+    #[cfg(not(target_os = "dragonfly"))]
     pub fn mkostemps(template: *mut ::c_char, suffixlen: ::c_int, flags: ::c_int) -> ::c_int;
 }