Run fmt.sh
This commit is contained in:
@@ -23,7 +23,7 @@ pub unsafe fn alloc_align(size: usize, alignment: usize) -> *mut c_void {
|
||||
align *= 2;
|
||||
}
|
||||
|
||||
alloc_inner(size, align/2, align)
|
||||
alloc_inner(size, align / 2, align)
|
||||
}
|
||||
|
||||
pub unsafe fn realloc(ptr: *mut c_void, size: size_t) -> *mut c_void {
|
||||
|
||||
@@ -57,7 +57,7 @@ pub type socklen_t = u32;
|
||||
|
||||
pub struct sockaddr {
|
||||
pub sa_family: sa_family_t,
|
||||
pub data: [c_char; 14]
|
||||
pub data: [c_char; 14],
|
||||
}
|
||||
|
||||
//TODO #[thread_local]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use core::ptr;
|
||||
|
||||
use ::*;
|
||||
use types::*;
|
||||
use *;
|
||||
|
||||
const AT_FDCWD: c_int = -100;
|
||||
const AT_EMPTY_PATH: c_int = 0x1000;
|
||||
@@ -179,9 +179,23 @@ pub fn read(fildes: c_int, buf: &mut [u8]) -> ssize_t {
|
||||
e(unsafe { syscall!(READ, fildes, buf.as_mut_ptr(), buf.len()) }) as ssize_t
|
||||
}
|
||||
|
||||
pub unsafe fn recvfrom(socket: c_int, buf: *mut c_void, len: size_t, flags: c_int,
|
||||
address: *mut sockaddr, address_len: *mut socklen_t) -> ssize_t {
|
||||
e(syscall!(RECVFROM, socket, buf, len, flags, address, address_len)) as ssize_t
|
||||
pub unsafe fn recvfrom(
|
||||
socket: c_int,
|
||||
buf: *mut c_void,
|
||||
len: size_t,
|
||||
flags: c_int,
|
||||
address: *mut sockaddr,
|
||||
address_len: *mut socklen_t,
|
||||
) -> ssize_t {
|
||||
e(syscall!(
|
||||
RECVFROM,
|
||||
socket,
|
||||
buf,
|
||||
len,
|
||||
flags,
|
||||
address,
|
||||
address_len
|
||||
)) as ssize_t
|
||||
}
|
||||
|
||||
pub fn rename(old: *const c_char, new: *const c_char) -> c_int {
|
||||
@@ -192,9 +206,17 @@ pub fn rmdir(path: *const c_char) -> c_int {
|
||||
e(unsafe { syscall!(UNLINKAT, AT_FDCWD, path, AT_REMOVEDIR) }) as c_int
|
||||
}
|
||||
|
||||
pub unsafe fn sendto(socket: c_int, buf: *const c_void, len: size_t, flags: c_int,
|
||||
dest_addr: *const sockaddr, dest_len: socklen_t) -> ssize_t {
|
||||
e(syscall!(SENDTO, socket, buf, len, flags, dest_addr, dest_len)) as ssize_t
|
||||
pub unsafe fn sendto(
|
||||
socket: c_int,
|
||||
buf: *const c_void,
|
||||
len: size_t,
|
||||
flags: c_int,
|
||||
dest_addr: *const sockaddr,
|
||||
dest_len: socklen_t,
|
||||
) -> ssize_t {
|
||||
e(syscall!(
|
||||
SENDTO, socket, buf, len, flags, dest_addr, dest_len
|
||||
)) as ssize_t
|
||||
}
|
||||
|
||||
pub fn setpgid(pid: pid_t, pgid: pid_t) -> c_int {
|
||||
|
||||
@@ -7,14 +7,14 @@ use syscall::data::Stat as redox_stat;
|
||||
use syscall::data::TimeSpec as redox_timespec;
|
||||
use syscall::flag::*;
|
||||
|
||||
use ::*;
|
||||
use types::*;
|
||||
use *;
|
||||
|
||||
#[repr(C)]
|
||||
struct SockData {
|
||||
port: in_port_t,
|
||||
addr: in_addr_t,
|
||||
_pad: [c_char; 8]
|
||||
_pad: [c_char; 8],
|
||||
}
|
||||
|
||||
pub fn e(sys: Result<usize, syscall::Error>) -> usize {
|
||||
@@ -381,15 +381,21 @@ pub fn read(fd: c_int, buf: &mut [u8]) -> ssize_t {
|
||||
e(syscall::read(fd as usize, buf)) as ssize_t
|
||||
}
|
||||
|
||||
pub unsafe fn recvfrom(socket: c_int, buf: *mut c_void, len: size_t, flags: c_int,
|
||||
address: *mut sockaddr, address_len: *mut socklen_t) -> ssize_t {
|
||||
pub unsafe fn recvfrom(
|
||||
socket: c_int,
|
||||
buf: *mut c_void,
|
||||
len: size_t,
|
||||
flags: c_int,
|
||||
address: *mut sockaddr,
|
||||
address_len: *mut socklen_t,
|
||||
) -> ssize_t {
|
||||
if flags != 0 {
|
||||
errno = syscall::EOPNOTSUPP;
|
||||
return -1;
|
||||
}
|
||||
let data = slice::from_raw_parts_mut(
|
||||
&mut (*address).data as *mut _ as *mut u8,
|
||||
(*address).data.len()
|
||||
(*address).data.len(),
|
||||
);
|
||||
let pathlen = e(syscall::fpath(socket as usize, data));
|
||||
if pathlen < 0 {
|
||||
@@ -416,8 +422,14 @@ pub fn rmdir(path: *const c_char) -> c_int {
|
||||
e(syscall::rmdir(path)) as c_int
|
||||
}
|
||||
|
||||
pub unsafe fn sendto(socket: c_int, buf: *const c_void, len: size_t, flags: c_int,
|
||||
_dest_addr: *const sockaddr, _dest_len: socklen_t) -> ssize_t {
|
||||
pub unsafe fn sendto(
|
||||
socket: c_int,
|
||||
buf: *const c_void,
|
||||
len: size_t,
|
||||
flags: c_int,
|
||||
_dest_addr: *const sockaddr,
|
||||
_dest_len: socklen_t,
|
||||
) -> ssize_t {
|
||||
// TODO: Use dest_addr and dest_len
|
||||
if flags != 0 {
|
||||
errno = syscall::EOPNOTSUPP;
|
||||
@@ -474,7 +486,7 @@ pub unsafe fn socket(domain: c_int, mut kind: c_int, protocol: c_int) -> c_int {
|
||||
// and later specifying one using `dup`.
|
||||
match kind {
|
||||
SOCK_STREAM => e(syscall::open("tcp:", flags)) as c_int,
|
||||
SOCK_DGRAM => e(syscall::open("udp:", flags)) as c_int,
|
||||
SOCK_DGRAM => e(syscall::open("udp:", flags)) as c_int,
|
||||
_ => {
|
||||
errno = syscall::EPROTOTYPE;
|
||||
-1
|
||||
|
||||
@@ -242,9 +242,7 @@ pub extern "C" fn fclose(stream: &mut FILE) -> c_int {
|
||||
if stream.flags & constants::F_PERM == 0 {
|
||||
// Not one of stdin, stdout or stderr
|
||||
unsafe {
|
||||
platform::free(
|
||||
stream as *mut FILE as *mut c_void
|
||||
);
|
||||
platform::free(stream as *mut FILE as *mut c_void);
|
||||
}
|
||||
} else {
|
||||
funlockfile(stream);
|
||||
|
||||
+10
-2
@@ -10,7 +10,11 @@ use core::ptr;
|
||||
use platform::types::*;
|
||||
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn bcmp(mut first: *const c_void, mut second: *const c_void, n: size_t) -> c_int {
|
||||
pub unsafe extern "C" fn bcmp(
|
||||
mut first: *const c_void,
|
||||
mut second: *const c_void,
|
||||
n: size_t,
|
||||
) -> c_int {
|
||||
let first = first as *const c_char;
|
||||
let second = second as *const c_char;
|
||||
|
||||
@@ -111,7 +115,11 @@ pub unsafe extern "C" fn strcasecmp(mut first: *const c_char, mut second: *const
|
||||
(*first == *second) as c_int
|
||||
}
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn strncasecmp(mut first: *const c_char, mut second: *const c_char, mut n: size_t) -> c_int {
|
||||
pub unsafe extern "C" fn strncasecmp(
|
||||
mut first: *const c_char,
|
||||
mut second: *const c_char,
|
||||
mut n: size_t,
|
||||
) -> c_int {
|
||||
while *first != 0 && *second != 0 && n > 0 {
|
||||
let mut i = *first;
|
||||
let mut j = *second;
|
||||
|
||||
@@ -16,7 +16,7 @@ pub type socklen_t = u32;
|
||||
#[repr(C)]
|
||||
pub struct sockaddr {
|
||||
pub sa_family: sa_family_t,
|
||||
data: [c_char; 14]
|
||||
data: [c_char; 14],
|
||||
}
|
||||
|
||||
pub const AF_INET: c_int = 2;
|
||||
@@ -93,7 +93,14 @@ pub unsafe extern "C" fn recv(
|
||||
length: size_t,
|
||||
flags: c_int,
|
||||
) -> ssize_t {
|
||||
recvfrom(socket, buffer, length, flags, ptr::null_mut(), ptr::null_mut())
|
||||
recvfrom(
|
||||
socket,
|
||||
buffer,
|
||||
length,
|
||||
flags,
|
||||
ptr::null_mut(),
|
||||
ptr::null_mut(),
|
||||
)
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
@@ -105,7 +112,14 @@ pub unsafe extern "C" fn recvfrom(
|
||||
address: *mut sockaddr,
|
||||
address_len: *mut socklen_t,
|
||||
) -> ssize_t {
|
||||
platform::recvfrom(socket, buffer, length, flags, address as *mut platform::sockaddr, address_len)
|
||||
platform::recvfrom(
|
||||
socket,
|
||||
buffer,
|
||||
length,
|
||||
flags,
|
||||
address as *mut platform::sockaddr,
|
||||
address_len,
|
||||
)
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
@@ -127,7 +141,14 @@ pub unsafe extern "C" fn sendto(
|
||||
dest_addr: *const sockaddr,
|
||||
dest_len: socklen_t,
|
||||
) -> ssize_t {
|
||||
platform::sendto(socket, message, length, flags, dest_addr as *const platform::sockaddr, dest_len)
|
||||
platform::sendto(
|
||||
socket,
|
||||
message,
|
||||
length,
|
||||
flags,
|
||||
dest_addr as *const platform::sockaddr,
|
||||
dest_len,
|
||||
)
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
|
||||
@@ -33,7 +33,7 @@ pub unsafe extern "C" fn sbrk(incr: intptr_t) -> *mut c_void {
|
||||
|
||||
if BRK < addr {
|
||||
platform::errno = ENOMEM;
|
||||
return -1isize as *mut c_void
|
||||
return -1isize as *mut c_void;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user