vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken ralloc submodule & fmt.sh

Browse Source
This commit is contained in:
jD91mZM2
2018-07-11 17:13:38 +02:00
parent 55e618d8c0
commit 5f4ebaaabf
3 changed files with 91 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ralloc
+1 -1
Submodule ralloc updated: f9b8c35fe8...6b7ea16aad
src/platform/src/linux/mod.rs
+31 -10
View File
@@ -123,7 +123,11 @@ pub fn getgid() -> gid_t {
e(unsafe { syscall!(GETGID) })
}
pub unsafe fn getpeername(socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int {
pub unsafe fn getpeername(
socket: c_int,
address: *mut sockaddr,
address_len: *mut socklen_t,
) -> c_int {
e(syscall!(GETPEERNAME, socket, address, address_len)) as c_int
}
@@ -139,7 +143,11 @@ pub fn getppid() -> pid_t {
e(unsafe { syscall!(GETPPID) })
}
pub unsafe fn getsockname(socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int {
pub unsafe fn getsockname(
socket: c_int,
address: *mut sockaddr,
address_len: *mut socklen_t,
) -> c_int {
e(syscall!(GETSOCKNAME, socket, address, address_len)) as c_int
}
@@ -150,7 +158,16 @@ pub fn getsockopt(
option_value: *mut c_void,
option_len: *mut socklen_t,
) -> c_int {
e(unsafe { syscall!(GETSOCKOPT, socket, level, option_name, option_value, option_len) }) as c_int
e(unsafe {
syscall!(
GETSOCKOPT,
socket,
level,
option_name,
option_value,
option_len
)
}) as c_int
}
pub fn getuid() -> uid_t {
@@ -264,7 +281,16 @@ pub fn setsockopt(
option_value: *const c_void,
option_len: socklen_t,
) -> c_int {
e(unsafe { syscall!(SETSOCKOPT, socket, level, option_name, option_value, option_len) }) as c_int
e(unsafe {
syscall!(
SETSOCKOPT,
socket,
level,
option_name,
option_value,
option_len
)
}) as c_int
}
pub fn shutdown(socket: c_int, how: c_int) -> c_int {
@@ -279,12 +305,7 @@ pub fn socket(domain: c_int, kind: c_int, protocol: c_int) -> c_int {
e(unsafe { syscall!(SOCKET, domain, kind, protocol) }) as c_int
}
pub fn socketpair(
domain: c_int,
kind: c_int,
protocol: c_int,
socket_vector: *mut c_int,
) -> c_int {
pub fn socketpair(domain: c_int, kind: c_int, protocol: c_int, socket_vector: *mut c_int) -> c_int {
e(unsafe { syscall!(SOCKETPAIR, domain, kind, protocol, socket_vector) }) as c_int
}
src/platform/src/redox/mod.rs
+59 -23
View File
@@ -4,10 +4,10 @@ use core::fmt::Write;
use core::mem;
use core::ptr;
use core::slice;
use syscall::{self, Result};
use syscall::data::Stat as redox_stat;
use syscall::data::TimeSpec as redox_timespec;
use syscall::flag::*;
use syscall::{self, Result};
use types::*;
use *;
@@ -71,8 +71,10 @@ pub unsafe fn accept(socket: c_int, address: *mut sockaddr, address_len: *mut so
if stream < 0 {
return -1;
}
if address != ptr::null_mut() && address_len != ptr::null_mut()
&& getpeername(stream, address, address_len) < 0 {
if address != ptr::null_mut()
&& address_len != ptr::null_mut()
&& getpeername(stream, address, address_len) < 0
{
return -1;
}
stream
@@ -282,8 +284,12 @@ pub fn getgid() -> gid_t {
e(syscall::getgid()) as gid_t
}
unsafe fn inner_get_name(local: bool, socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t)
-> Result<usize> {
unsafe fn inner_get_name(
local: bool,
socket: c_int,
address: *mut sockaddr,
address_len: *mut socklen_t,
) -> Result<usize> {
// 32 should probably be large enough.
// Format: tcp:remote/local
// and since we only yet support IPv4 (I think)...
@@ -302,7 +308,7 @@ unsafe fn inner_get_name(local: bool, socket: c_int, address: *mut sockaddr, add
let data = slice::from_raw_parts_mut(
&mut (*address).data as *mut _ as *mut u8,
(*address).data.len()
(*address).data.len(),
);
let len = data.len().min(part.len());
@@ -312,7 +318,11 @@ unsafe fn inner_get_name(local: bool, socket: c_int, address: *mut sockaddr, add
Ok(0)
}
pub unsafe fn getpeername(socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int {
pub unsafe fn getpeername(
socket: c_int,
address: *mut sockaddr,
address_len: *mut socklen_t,
) -> c_int {
e(inner_get_name(false, socket, address, address_len)) as c_int
}
@@ -328,7 +338,11 @@ pub fn getppid() -> pid_t {
e(syscall::getppid()) as pid_t
}
pub unsafe fn getsockname(socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int {
pub unsafe fn getsockname(
socket: c_int,
address: *mut sockaddr,
address_len: *mut socklen_t,
) -> c_int {
e(inner_get_name(true, socket, address, address_len)) as c_int
}
@@ -339,8 +353,15 @@ pub fn getsockopt(
option_value: *mut c_void,
option_len: *mut socklen_t,
) -> c_int {
let _ = write!(::FileWriter(2), "unimplemented: getsockopt({}, {}, {}, {:p}, {:p})",
socket, level, option_name, option_value, option_len);
let _ = write!(
::FileWriter(2),
"unimplemented: getsockopt({}, {}, {}, {:p}, {:p})",
socket,
level,
option_name,
option_value,
option_len
);
-1
}
@@ -462,8 +483,10 @@ pub unsafe fn recvfrom(
errno = syscall::EOPNOTSUPP;
return -1;
}
if address != ptr::null_mut() && address_len != ptr::null_mut()
&& getpeername(socket, address, address_len) < 0 {
if address != ptr::null_mut()
&& address_len != ptr::null_mut()
&& getpeername(socket, address, address_len) < 0
{
return -1;
}
read(socket, slice::from_raw_parts_mut(buf as *mut u8, len))
@@ -524,13 +547,25 @@ pub fn setsockopt(
option_value: *const c_void,
option_len: socklen_t,
) -> c_int {
let _ = write!(::FileWriter(2), "unimplemented: setsockopt({}, {}, {}, {:p}, {})",
socket, level, option_name, option_value, option_len);
let _ = write!(
::FileWriter(2),
"unimplemented: setsockopt({}, {}, {}, {:p}, {})",
socket,
level,
option_name,
option_value,
option_len
);
-1
}
pub fn shutdown(socket: c_int, how: c_int) -> c_int {
let _ = write!(::FileWriter(2), "unimplemented: shutdown({}, {})", socket, how);
let _ = write!(
::FileWriter(2),
"unimplemented: shutdown({}, {})",
socket,
how
);
-1
}
@@ -578,14 +613,15 @@ pub unsafe fn socket(domain: c_int, mut kind: c_int, protocol: c_int) -> c_int {
}
}
pub fn socketpair(
domain: c_int,
kind: c_int,
protocol: c_int,
socket_vector: *mut c_int,
) -> c_int {
let _ = write!(::FileWriter(2), "unimplemented: socketpair({}, {}, {}, {:p})",
domain, kind, protocol, socket_vector);
pub fn socketpair(domain: c_int, kind: c_int, protocol: c_int, socket_vector: *mut c_int) -> c_int {
let _ = write!(
::FileWriter(2),
"unimplemented: socketpair({}, {}, {}, {:p})",
domain,
kind,
protocol,
socket_vector
);
-1
}