Haiku: move BSD API to a separate file

Haiku implements various parts of the (non-POSIX) BSD API. This moves it to a
separate file, for easier future maintenance.

No functional change intended; the changes are synchronized with R1Beta5

(backport <#4221>)
(cherry picked from commit f1091a7)

Author: nielx

src/unix/haiku/bsd.rs

@@ -0,0 +1,81 @@
+//! This file contains the BSD APIs available in Haiku. It corresponds to the
+//! header files in `headers/compatibility/bsd`.
+//!
+//! Note that Haiku's BSD compatibility is a combination of system APIs and
+//! utility libraries. There should only be system APIs in `libc`. When you are
+//! trying to determine whether something should be included in this file, the
+//! best indicator is whether it also exists in the BSD-specific definitions in
+//! this libc crate.
+
+use crate::prelude::*;
+
+// stringlist.h (utility library)
+// Note: this is kept because it was previously introduced
+pub type StringList = _stringlist;
+
+s! {
+    // stringlist.h (utility library)
+    // Note: this is kept because it was previously introduced
+    pub struct _stringlist {
+        pub sl_str: *mut *mut c_char,
+        pub sl_max: size_t,
+        pub sl_cur: size_t,
+    }
+
+    // sys/link_elf.h
+    pub struct dl_phdr_info {
+        pub dlpi_addr: crate::Elf_Addr,
+        pub dlpi_name: *const c_char,
+        pub dlpi_phdr: *const crate::Elf_Phdr,
+        pub dlpi_phnum: crate::Elf_Half,
+    }
+}
+
+#[link(name = "bsd")]
+extern "C" {
+    // stdlib.h
+    pub fn daemon(nochdir: c_int, noclose: c_int) -> c_int;
+    pub fn getprogname() -> *const c_char;
+    pub fn setprogname(progname: *const c_char);
+    pub fn arc4random() -> u32;
+    pub fn arc4random_uniform(upper_bound: u32) -> u32;
+    pub fn arc4random_buf(buf: *mut c_void, n: size_t);
+
+    // pty.h
+    pub fn openpty(
+        amaster: *mut c_int,
+        aslave: *mut c_int,
+        name: *mut c_char,
+        termp: *mut crate::termios,
+        winp: *mut crate::winsize,
+    ) -> c_int;
+    pub fn login_tty(_fd: c_int) -> c_int;
+    pub fn forkpty(
+        amaster: *mut c_int,
+        name: *mut c_char,
+        termp: *mut crate::termios,
+        winp: *mut crate::winsize,
+    ) -> crate::pid_t;
+
+    // string.h
+    pub fn strsep(string: *mut *mut c_char, delimiters: *const c_char) -> *mut c_char;
+    pub fn explicit_bzero(buf: *mut c_void, len: size_t);
+
+    // stringlist.h (utility library)
+    // Note: this is kept because it was previously introduced
+    pub fn sl_init() -> *mut StringList;
+    pub fn sl_add(sl: *mut StringList, n: *mut c_char) -> c_int;
+    pub fn sl_free(sl: *mut StringList, i: c_int);
+    pub fn sl_find(sl: *mut StringList, n: *mut c_char) -> *mut c_char;
+
+    // sys/link_elf.h
+    pub fn dl_iterate_phdr(
+        callback: Option<
+            unsafe extern "C" fn(info: *mut dl_phdr_info, size: usize, data: *mut c_void) -> c_int,
+        >,
+        data: *mut c_void,
+    ) -> c_int;
+
+    // sys/time.h
+    pub fn lutimes(file: *const c_char, times: *const crate::timeval) -> c_int;
+}

src/unix/haiku/mod.rs

@@ -1,5 +1,29 @@
 use crate::prelude::*;
 
+// This module contains bindings to the native Haiku API. The Haiku API
+// originates from BeOS, and it was the original way to perform low level
+// system and IO operations. The POSIX API was in that era was like a
+// compatibility layer. In current Haiku development, both the POSIX API and
+// the Haiku API are considered to be co-equal status. However, they are not
+// integrated like they are on other UNIX platforms, which means that for many
+// low level concepts there are two versions, like processes (POSIX) and
+// teams (Haiku), or pthreads and native threads.
+//
+// Both the POSIX API and the Haiku API live in libroot.so, the library that is
+// linked to any binary by default. Additionally, Haiku supports several
+// non-POSIX APIs from BSD and GNU, which live in libbsd.so and libgnu.so. These
+// modules are also supported.
+//
+// The module is comprised of the following files:
+// - `mod.rs` (this file) implements the C11 and POSIX API found in
+//     `headers/posix`
+// - `b32.rs`, `b64.rs` and `x86_64.rs` contain platform-specific definitions
+//      of the C11 and POSIX APIs
+// - `native.rs` defines the native Haiku API that is implemented in
+//     `libroot.so` and that are found in `headers/os`.
+// - `bsd.rs` defines the BSD customizations available on Haiku found in
+//     `headers/compatibility/bsd`
+
 pub type rlim_t = crate::uintptr_t;
 pub type sa_family_t = u8;
 pub type pthread_key_t = c_int;
@@ -56,8 +80,6 @@ pub type ACTION = c_int;
 pub type posix_spawnattr_t = *mut c_void;
 pub type posix_spawn_file_actions_t = *mut c_void;
 
-pub type StringList = _stringlist;
-
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum timezone {}
 impl Copy for timezone {}
@@ -440,19 +462,6 @@ s! {
         pub flag: *mut c_int,
         pub val: c_int,
     }
-
-    pub struct _stringlist {
-        pub sl_str: *mut *mut c_char,
-        pub sl_max: size_t,
-        pub sl_cur: size_t,
-    }
-
-    pub struct dl_phdr_info {
-        pub dlpi_addr: crate::Elf_Addr,
-        pub dlpi_name: *const c_char,
-        pub dlpi_phdr: *const crate::Elf_Phdr,
-        pub dlpi_phnum: crate::Elf_Half,
-    }
 }
 
 s_no_extra_traits! {
@@ -1772,7 +1781,6 @@ extern "C" {
         addr: *mut crate::sockaddr,
         addrlen: *mut crate::socklen_t,
     ) -> ssize_t;
-    pub fn mkstemps(template: *mut c_char, suffixlen: c_int) -> c_int;
     pub fn nl_langinfo(item: crate::nl_item) -> *mut c_char;
 
     pub fn bind(
@@ -2032,46 +2040,6 @@ extern "C" {
     pub fn getentropy(buf: *mut c_void, buflen: size_t) -> c_int;
 }
 
-#[link(name = "bsd")]
-extern "C" {
-    pub fn lutimes(file: *const c_char, times: *const crate::timeval) -> c_int;
-    pub fn daemon(nochdir: c_int, noclose: c_int) -> c_int;
-    pub fn forkpty(
-        amaster: *mut c_int,
-        name: *mut c_char,
-        termp: *mut termios,
-        winp: *mut crate::winsize,
-    ) -> crate::pid_t;
-    pub fn openpty(
-        amaster: *mut c_int,
-        aslave: *mut c_int,
-        name: *mut c_char,
-        termp: *mut termios,
-        winp: *mut crate::winsize,
-    ) -> c_int;
-    pub fn strsep(string: *mut *mut c_char, delimiters: *const c_char) -> *mut c_char;
-    pub fn explicit_bzero(buf: *mut c_void, len: size_t);
-    pub fn login_tty(_fd: c_int) -> c_int;
-
-    pub fn sl_init() -> *mut StringList;
-    pub fn sl_add(sl: *mut StringList, n: *mut c_char) -> c_int;
-    pub fn sl_free(sl: *mut StringList, i: c_int);
-    pub fn sl_find(sl: *mut StringList, n: *mut c_char) -> *mut c_char;
-
-    pub fn getprogname() -> *const c_char;
-    pub fn setprogname(progname: *const c_char);
-    pub fn dl_iterate_phdr(
-        callback: Option<
-            unsafe extern "C" fn(info: *mut dl_phdr_info, size: usize, data: *mut c_void) -> c_int,
-        >,
-        data: *mut c_void,
-    ) -> c_int;
-
-    pub fn arc4random() -> u32;
-    pub fn arc4random_uniform(upper_bound: u32) -> u32;
-    pub fn arc4random_buf(buf: *mut c_void, n: size_t);
-}
-
 #[link(name = "gnu")]
 extern "C" {
     pub fn memmem(
@@ -2115,5 +2083,8 @@ cfg_if! {
     }
 }
 
+mod bsd;
+pub use self::bsd::*;
+
 mod native;
 pub use self::native::*;

src/unix/haiku/native.rs

@@ -1,19 +1,7 @@
 use crate::off_t;
 use crate::prelude::*;
 
-// This module contains bindings to the native Haiku API. The Haiku API
-// originates from BeOS, and it was the original way to perform low level
-// system and IO operations. The POSIX API was in that era was like a
-// compatibility layer. In current Haiku development, both the POSIX API and
-// the Haiku API are considered to be co-equal status. However, they are not
-// integrated like they are on other UNIX platforms, which means that for many
-// low level concepts there are two versions, like processes (POSIX) and
-// teams (Haiku), or pthreads and native threads.
-//
-// Both the POSIX API and the Haiku API live in libroot.so, the library that is
-// linked to any binary by default.
-//
-// This file follows the Haiku API for Haiku R1 beta 2. It is organized by the
+// This file follows the Haiku API for Haiku R1 beta 5. It is organized by the
 // C/C++ header files in which the concepts can be found, while adhering to the
 // style guide for this crate.