Skip to content

haiku: add platform support. #772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

haiku: add platform support. #772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
213 changes: 197 additions & 16 deletions src/errno.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ unsafe fn errno_location() -> *mut c_int {
__errno()
}

#[cfg(target_os = "haiku")]
unsafe fn errno_location() -> *mut c_int {
extern { fn _errnop() -> *mut c_int; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be declared in libc instead of here.

_errnop()
}

/// Sets the platform-specific errno to no-error
unsafe fn clear() -> () {
*errno_location() = 0;
Expand Down Expand Up @@ -144,6 +150,7 @@ fn desc(errno: Errno) -> &'static str {
ENOMEM => "Out of memory",
EACCES => "Permission denied",
EFAULT => "Bad address",
#[cfg(not(target_os = "haiku"))]
ENOTBLK => "Block device required",
EBUSY => "Device or resource busy",
EEXIST => "File exists",
Expand Down Expand Up @@ -180,6 +187,7 @@ fn desc(errno: Errno) -> &'static str {
EPROTOTYPE => "Protocol wrong type for socket",
ENOPROTOOPT => "Protocol not available",
EPROTONOSUPPORT => "Protocol not supported",
#[cfg(not(target_os = "haiku"))]
ESOCKTNOSUPPORT => "Socket type not supported",
EPFNOSUPPORT => "Protocol family not supported",
EAFNOSUPPORT => "Address family not supported by protocol",
Expand All @@ -194,6 +202,7 @@ fn desc(errno: Errno) -> &'static str {
EISCONN => "Transport endpoint is already connected",
ENOTCONN => "Transport endpoint is not connected",
ESHUTDOWN => "Cannot send after transport endpoint shutdown",
#[cfg(not(target_os = "haiku"))]
ETOOMANYREFS => "Too many references: cannot splice",
ETIMEDOUT => "Connection timed out",
ECONNREFUSED => "Connection refused",
Expand Down Expand Up @@ -389,10 +398,10 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
EDOOFUS => "Programming error",

#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
#[cfg(any(target_os = "freebsd", target_os = "dragonfly", target_os = "haiku"))]
EMULTIHOP => "Multihop attempted",

#[cfg(any(target_os = "freebsd", target_os = "dragonfly"))]
#[cfg(any(target_os = "freebsd", target_os = "dragonfly", target_os = "haiku"))]
ENOLINK => "Link has been severed",

#[cfg(target_os = "freebsd")]
Expand All @@ -404,19 +413,19 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
ENEEDAUTH => "Need authenticator",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
EOVERFLOW => "Value too large to be stored in data type",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
EILSEQ => "Illegal byte sequence",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
ENOATTR => "Attribute not found",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
EBADMSG => "Bad message",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
EPROTO => "Protocol error",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "ios"))]
Expand All @@ -425,7 +434,7 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "ios"))]
EOWNERDEAD => "Previous owner died",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
ENOTSUP => "Operation not supported",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
Expand All @@ -434,10 +443,10 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
EUSERS => "Too many users",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
EDQUOT => "Disc quota exceeded",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
ESTALE => "Stale NFS file handle",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
Expand All @@ -464,7 +473,7 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
EAUTH => "Authentication error",

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
ECANCELED => "Operation canceled",

#[cfg(any(target_os = "macos", target_os = "ios"))]
Expand All @@ -488,19 +497,19 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
EMULTIHOP => "Reserved",

#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
ENODATA => "No message available on STREAM",

#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
ENOLINK => "Reserved",

#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
ENOSR => "No STREAM resources",

#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
ENOSTR => "Not a STREAM",

#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "ios", target_os = "netbsd", target_os = "haiku"))]
ETIME => "STREAM ioctl timeout",

#[cfg(any(target_os = "macos", target_os = "ios"))]
Expand All @@ -512,7 +521,7 @@ fn desc(errno: Errno) -> &'static str {
#[cfg(any(target_os = "macos", target_os = "ios"))]
EQFULL => "Interface output queue is full",

#[cfg(target_os = "openbsd")]
#[cfg(any(target_os = "openbsd", target_os = "haiku"))]
EOPNOTSUPP => "Operation not supported",

#[cfg(target_os = "openbsd")]
Expand All @@ -523,6 +532,12 @@ fn desc(errno: Errno) -> &'static str {

#[cfg(target_os = "dragonfly")]
EASYNC => "Async",

#[cfg(target_os = "haiku")]
EFPOS => "File position error",

#[cfg(target_os = "haiku")]
ESIGPARM => "Signal error",
}
}

Expand Down Expand Up @@ -1910,6 +1925,172 @@ mod consts {
}
}

#[cfg(target_os = "haiku")]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nix does not define constants anymore. Instead, all of these should be defined in the libc crate, and nix should reference libc.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean how the linux version is done? I had wondered why it was different to the other platforms.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. It looks like Somebody fixed the Linux definitions in change 3354ffe , but not other OS's.

mod consts {
#[derive(Copy, Debug, Clone, PartialEq)]
pub enum Errno {
UnknownErrno = 0,
E2BIG = -2147454975,
ECHILD = -2147454974,
EDEADLK = -2147454973,
EFBIG = -2147454972,
EMLINK = -2147454971,
ENFILE = -2147454970,
ENODEV = -2147454969,
ENOLCK = -2147454968,
ENOSYS = -2147454967,
ENOTTY = -2147454966,
ENXIO = -2147454965,
ESPIPE = -2147454964,
ESRCH = -2147454963,
EFPOS = -2147457962,
ESIGPARM = -2147457961,
EDOM = -2147454960,
ERANGE = -2147454959,
EPROTOTYPE = -2147454958,
EPROTONOSUPPORT = -2147454957,
EPFNOSUPPORT = -2147454956,
EAFNOSUPPORT = -2147454955,
EADDRINUSE = -2147454954,
EADDRNOTAVAIL = -2147454953,
ENETDOWN = -2147454952,
ENETUNREACH = -2147454951,
ENETRESET = -2147454950,
ECONNABORTED = -2147454949,
ECONNRESET = -2147454948,
EISCONN = -2147454947,
ENOTCONN = -2147454946,
ESHUTDOWN = -2147454945,
ECONNREFUSED = -2147454944,
EHOSTUNREACH = -2147454943,
ENOPROTOOPT = -2147454942,
ENOBUFS = -2147454941,
EINPROGRESS = -2147454940,
EALREADY = -2147454939,
EILSEQ = -2147454938,
ENOMSG = -2147454937,
ESTALE = -2147454936,
EOVERFLOW = -2147454935,
EMSGSIZE = -2147454934,
EOPNOTSUPP = -2147454933,
ENOTSOCK = -2147454932,
EHOSTDOWN = -2147454931,
EBADMSG = -2147454930,
ECANCELED = -2147454929,
EDESTADDRREQ = -2147454928,
EDQUOT = -2147454927,
EIDRM = -2147454926,
EMULTIHOP = -2147454925,
ENODATA = -2147454924,
ENOLINK = -2147454923,
ENOSR = -2147454922,
ENOSTR = -2147454921,
ENOTSUP = -2147454920,
EPROTO = -2147454919,
ETIME = -2147454918,
ETXTBSY = -2147454917,
ENOATTR = -2147454916,
ENOMEM = -2147454976,
EACCES = -2147483646,
EINTR = -2147483638,
EIO = -2147483647,
EBUSY = -2147483634,
EFAULT = -2147478783,
ETIMEDOUT = -2147483639,
EAGAIN = -2147483637,
EBADF = -2147459072,
EEXIST = -2147459070,
EINVAL = -2147483643,
ENAMETOOLONG = -2147459068,
ENOENT = -2147459069,
EPERM = -2147483633,
ENOTDIR = -2147459067,
EISDIR = -2147459063,
ENOTEMPTY = -2147459066,
ENOSPC = -2147459065,
EROFS = -2147459064,
EMFILE = -2147459062,
EXDEV = -2147459061,
ELOOP = -2147459060,
ENOEXEC = -2147478782,
EPIPE = -2147459059,
}

pub const ELAST: Errno = Errno::ENOTSUP;
pub const EWOULDBLOCK: Errno = Errno::EAGAIN;

pub const EL2NSYC: Errno = Errno::UnknownErrno;

pub fn from_i32(e: i32) -> Errno {
use self::Errno::*;

match e {
0 => UnknownErrno,
-2147454975 => E2BIG,
-2147454974 => ECHILD,
-2147454973 => EDEADLK,
-2147454972 => EFBIG,
-2147454971 => EMLINK,
-2147454970 => ENFILE,
-2147454969 => ENODEV,
-2147454968 => ENOLCK,
-2147454967 => ENOSYS,
-2147454966 => ENOTTY,
-2147454965 => ENXIO,
-2147454964 => ESPIPE,
-2147454963 => ESRCH,
-2147457962 => EFPOS,
-2147457961 => ESIGPARM,
-2147454960 => EDOM,
-2147454959 => ERANGE,
-2147454958 => EPROTOTYPE,
-2147454957 => EPROTONOSUPPORT,
-2147454956 => EPFNOSUPPORT,
-2147454955 => EAFNOSUPPORT,
-2147454954 => EADDRINUSE,
-2147454953 => EADDRNOTAVAIL,
-2147454952 => ENETDOWN,
-2147454951 => ENETUNREACH,
-2147454950 => ENETRESET,
-2147454949 => ECONNABORTED,
-2147454948 => ECONNRESET,
-2147454947 => EISCONN,
-2147454946 => ENOTCONN,
-2147454945 => ESHUTDOWN,
-2147454944 => ECONNREFUSED,
-2147454943 => EHOSTUNREACH,
-2147454942 => ENOPROTOOPT,
-2147454941 => ENOBUFS,
-2147454940 => EINPROGRESS,
-2147454939 => EALREADY,
-2147454938 => EILSEQ,
-2147454937 => ENOMSG,
-2147454936 => ESTALE,
-2147454935 => EOVERFLOW,
-2147454934 => EMSGSIZE,
-2147454933 => EOPNOTSUPP,
-2147454932 => ENOTSOCK,
-2147454931 => EHOSTDOWN,
-2147454930 => EBADMSG,
-2147454929 => ECANCELED,
-2147454928 => EDESTADDRREQ,
-2147454927 => EDQUOT,
-2147454926 => EIDRM,
-2147454925 => EMULTIHOP,
-2147454924 => ENODATA,
-2147454923 => ENOLINK,
-2147454922 => ENOSR,
-2147454921 => ENOSTR,
-2147454920 => ENOTSUP,
-2147454919 => EPROTO,
-2147454918 => ETIME,
-2147454917 => ETXTBSY,
-2147454916 => ENOATTR,
-2147454976 => ENOMEM,
_ => UnknownErrno,
}
}
}

#[cfg(test)]
mod test {
Expand Down
7 changes: 5 additions & 2 deletions src/fcntl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ libc_bitflags!(
O_ALT_IO;
/// Open the file in append-only mode.
O_APPEND;
#[cfg(not(target_os = "haiku"))]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should actually go underneath the comment.

/// Generate a signal when input or output becomes possible.
O_ASYNC;
/// Closes the file descriptor once an `execve` call is made.
Expand All @@ -52,7 +53,8 @@ libc_bitflags!(
target_os = "linux",
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd"))]
target_os = "openbsd",
target_os = "haiku"))]
O_DSYNC;
/// Error out if a file was not created.
O_EXCL;
Expand Down Expand Up @@ -84,6 +86,7 @@ libc_bitflags!(
O_NOATIME;
/// Don't attach the device as the process' controlling terminal.
O_NOCTTY;
#[cfg(not(target_os = "haiku"))]
/// Same as `O_NONBLOCK`.
O_NDELAY;
/// `open()` will fail if the given path is a symbolic link.
Expand All @@ -107,7 +110,7 @@ libc_bitflags!(
/// This should not be combined with `O_WRONLY` or `O_RDWR`.
O_RDWR;
/// Similar to `O_DSYNC` but applies to `read`s instead.
#[cfg(any(target_os = "linux", target_os = "netbsd", target_os = "openbsd"))]
#[cfg(any(target_os = "linux", target_os = "netbsd", target_os = "openbsd", target_os = "haiku"))]
O_RSYNC;
/// Skip search permission checks.
#[cfg(target_os = "netbsd")]
Expand Down
2 changes: 1 addition & 1 deletion src/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ mod os {
}
}

#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd"))]
#[cfg(any(target_os = "macos", target_os = "freebsd", target_os = "dragonfly", target_os = "ios", target_os = "openbsd", target_os = "netbsd", target_os = "haiku"))]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please line wrap these.

mod os {
pub fn socket_atomic_cloexec() -> bool {
false
Expand Down
3 changes: 2 additions & 1 deletion src/sys/ioctl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,8 @@ mod platform;
target_os = "netbsd",
target_os = "openbsd",
target_os = "freebsd",
target_os = "dragonfly"))]
target_os = "dragonfly",
target_os = "haiku"))]
#[path = "platform/bsd.rs"]
#[macro_use]
mod platform;
Expand Down
Loading