Merge pull request RustPython#1686 from RustPython/coolreader18/redox-fix

Fix compilation on Redox

Author: youknowone

Cargo.lock

@@ -32,7 +32,7 @@ flame = { version = "0.2", optional = true }
 flamescope = { version = "0.1", optional = true }
 
 [target.'cfg(not(target_os = "wasi"))'.dependencies]
-rustyline = "=5.0.1"
+rustyline = "6.0"
 
 
 [dev-dependencies.cpython]
@@ -45,5 +45,9 @@ path = "src/main.rs"
 [patch.crates-io]
 # REDOX START, Uncommment when you want to compile/check with redoxer
 # time = { git = "https://gitlab.redox-os.org/redox-os/time.git", branch = "redox-unix" }
-# nix = { git = "https://github.com/AdminXVII/nix",	branch = "add-redox-support" }
+# nix = { git = "https://github.com/AdminXVII/nix", branch = "add-redox-support" }
+# # following patches are just waiting on a new version to be released to crates.io
+# socket2 = { git = "https://github.com/alexcrichton/socket2-rs" }
+# rustyline = { git = "https://github.com/kkawakam/rustyline" }
+# libc = { git = "https://github.com/rust-lang/libc" }
 # REDOX END

Cargo.toml

@@ -2,7 +2,10 @@ use rustpython_vm::obj::objstr::PyStringRef;
 use rustpython_vm::pyobject::{PyIterable, PyResult, TryFromObject};
 use rustpython_vm::scope::{NameProtocol, Scope};
 use rustpython_vm::VirtualMachine;
-use rustyline::{completion::Completer, highlight::Highlighter, hint::Hinter, Context, Helper};
+use rustyline::{
+    completion::Completer, highlight::Highlighter, hint::Hinter, validate::Validator, Context,
+    Helper,
+};
 
 pub struct ShellHelper<'vm> {
     vm: &'vm VirtualMachine,
@@ -162,4 +165,5 @@ impl Completer for ShellHelper<'_> {
 
 impl Hinter for ShellHelper<'_> {}
 impl Highlighter for ShellHelper<'_> {}
+impl Validator for ShellHelper<'_> {}
 impl Helper for ShellHelper<'_> {}

src/shell/rustyline_helper.rs

@@ -61,7 +61,7 @@ unic-common = "0.9"
 maplit = "1.0"
 bitflags = "1.1"
 libc = "0.2"
-nix = "0.15.0"
+nix = "0.16.0"
 wtf8 = "0.0.3"
 arr_macro = "0.1.2"
 csv = "1.1.1"
@@ -88,6 +88,8 @@ gethostname = "0.2.0"
 subprocess = "0.1.18"
 num_cpus = "1"
 socket2 = { version = "0.3", features = ["unix"] }
+
+[target.'cfg(not(any(target_arch = "wasm32", target_os = "redox")))'.dependencies]
 dns-lookup = "1.0"
 
 [target."cfg(windows)".dependencies.winapi]

vm/Cargo.toml

@@ -1424,10 +1424,7 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) ->
         "EX_PROTOCOL" => ctx.new_int(exitcode::PROTOCOL as i8),
         "EX_NOPERM" => ctx.new_int(exitcode::NOPERM as i8),
         "EX_CONFIG" => ctx.new_int(exitcode::CONFIG as i8),
-        "O_DSYNC" => ctx.new_int(libc::O_DSYNC),
         "O_NONBLOCK" => ctx.new_int(libc::O_NONBLOCK),
-        "O_NDELAY" => ctx.new_int(libc::O_NDELAY),
-        "O_NOCTTY" => ctx.new_int(libc::O_NOCTTY),
         "O_CLOEXEC" => ctx.new_int(libc::O_CLOEXEC),
     });
 
@@ -1438,6 +1435,9 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) ->
         "setegid" => ctx.new_function(os_setegid),
         "seteuid" => ctx.new_function(os_seteuid),
         "openpty" => ctx.new_function(os_openpty),
+        "O_DSYNC" => ctx.new_int(libc::O_DSYNC),
+        "O_NDELAY" => ctx.new_int(libc::O_NDELAY),
+        "O_NOCTTY" => ctx.new_int(libc::O_NOCTTY),
     });
 
     // cfg taken from nix

vm/src/stdlib/os.rs

@@ -7,16 +7,16 @@ use std::{io, mem};
 type RawFd = i32;
 
 #[cfg(unix)]
-use libc::{fd_set, select, timeval, FD_ISSET, FD_SET, FD_SETSIZE, FD_ZERO};
+use libc::{select, timeval};
 
 #[cfg(windows)]
-use winapi::um::winsock2::{fd_set, select, timeval, WSAStartup, FD_SETSIZE, SOCKET as RawFd};
+use winapi::um::winsock2::{select, timeval, WSAStartup, SOCKET as RawFd};
 
 // from winsock2.h: https://gist.github.com/piscisaureus/906386#file-winsock2-h-L128-L141
 #[cfg(windows)]
 #[allow(non_snake_case)]
-mod fd_ops {
-    use winapi::um::winsock2::{__WSAFDIsSet, fd_set, FD_SETSIZE, SOCKET};
+mod fdset_ops {
+    pub use winapi::um::winsock2::{__WSAFDIsSet, fd_set, FD_SETSIZE, SOCKET};
 
     pub unsafe fn FD_SET(fd: SOCKET, set: *mut fd_set) {
         let mut i = 0;
@@ -42,8 +42,10 @@ mod fd_ops {
         __WSAFDIsSet(fd as _, set) != 0
     }
 }
-#[cfg(windows)]
-use fd_ops::*;
+#[cfg(unix)]
+use libc as fdset_ops;
+
+use fdset_ops::{fd_set, FD_ISSET, FD_SET, FD_SETSIZE, FD_ZERO};
 
 struct Selectable {
     obj: PyObjectRef,

vm/src/stdlib/select.rs

@@ -470,6 +470,7 @@ struct GAIOptions {
     flags: i32,
 }
 
+#[cfg(not(target_os = "redox"))]
 fn socket_getaddrinfo(opts: GAIOptions, vm: &VirtualMachine) -> PyResult {
     let hints = dns_lookup::AddrInfoHints {
         socktype: opts.ty,
@@ -512,6 +513,7 @@ fn socket_getaddrinfo(opts: GAIOptions, vm: &VirtualMachine) -> PyResult {
     Ok(vm.ctx.new_list(list))
 }
 
+#[cfg(not(target_os = "redox"))]
 fn socket_gethostbyaddr(
     addr: PyStringRef,
     vm: &VirtualMachine,
@@ -609,9 +611,20 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
     let socket_gaierror = ctx.new_class("socket.gaierror", vm.ctx.exceptions.os_error.clone());
 
     let module = py_module!(vm, "_socket", {
+        "socket" => PySocket::make_class(ctx),
         "error" => ctx.exceptions.os_error.clone(),
         "timeout" => socket_timeout,
         "gaierror" => socket_gaierror,
+        "inet_aton" => ctx.new_function(socket_inet_aton),
+        "inet_ntoa" => ctx.new_function(socket_inet_ntoa),
+        "gethostname" => ctx.new_function(socket_gethostname),
+        "htonl" => ctx.new_function(socket_hton::<u32>),
+        "htons" => ctx.new_function(socket_hton::<u16>),
+        "ntohl" => ctx.new_function(socket_ntoh::<u32>),
+        "ntohs" => ctx.new_function(socket_ntoh::<u16>),
+        "getdefaulttimeout" => ctx.new_function(|vm: &VirtualMachine| vm.get_none()),
+        "has_ipv6" => ctx.new_bool(false),
+        // constants
         "AF_UNSPEC" => ctx.new_int(0),
         "AF_INET" => ctx.new_int(c::AF_INET),
         "AF_INET6" => ctx.new_int(c::AF_INET6),
@@ -620,33 +633,28 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "SHUT_RD" => ctx.new_int(c::SHUT_RD),
         "SHUT_WR" => ctx.new_int(c::SHUT_WR),
         "SHUT_RDWR" => ctx.new_int(c::SHUT_RDWR),
-        "MSG_OOB" => ctx.new_int(c::MSG_OOB),
         "MSG_PEEK" => ctx.new_int(c::MSG_PEEK),
-        "MSG_WAITALL" => ctx.new_int(c::MSG_WAITALL),
-        "AI_ALL" => ctx.new_int(c::AI_ALL),
-        "AI_PASSIVE" => ctx.new_int(c::AI_PASSIVE),
         "IPPROTO_TCP" => ctx.new_int(c::IPPROTO_TCP),
         "IPPROTO_UDP" => ctx.new_int(c::IPPROTO_UDP),
         "IPPROTO_IP" => ctx.new_int(c::IPPROTO_IP),
         "IPPROTO_IPIP" => ctx.new_int(c::IPPROTO_IP),
         "IPPROTO_IPV6" => ctx.new_int(c::IPPROTO_IPV6),
-        "IPPROTO_NONE" => ctx.new_int(c::IPPROTO_NONE),
         "SOL_SOCKET" => ctx.new_int(c::SOL_SOCKET),
         "SO_REUSEADDR" => ctx.new_int(c::SO_REUSEADDR),
         "TCP_NODELAY" => ctx.new_int(c::TCP_NODELAY),
         "SO_BROADCAST" => ctx.new_int(c::SO_BROADCAST),
-        "socket" => PySocket::make_class(ctx),
-        "inet_aton" => ctx.new_function(socket_inet_aton),
-        "inet_ntoa" => ctx.new_function(socket_inet_ntoa),
-        "gethostname" => ctx.new_function(socket_gethostname),
-        "htonl" => ctx.new_function(socket_hton::<u32>),
-        "htons" => ctx.new_function(socket_hton::<u16>),
-        "ntohl" => ctx.new_function(socket_ntoh::<u32>),
-        "ntohs" => ctx.new_function(socket_ntoh::<u16>),
-        "has_ipv6" => ctx.new_bool(false),
-        "getdefaulttimeout" => ctx.new_function(|vm: &VirtualMachine| vm.get_none()),
+    });
+
+    #[cfg(not(target_os = "redox"))]
+    extend_module!(vm, module, {
         "getaddrinfo" => ctx.new_function(socket_getaddrinfo),
         "gethostbyaddr" => ctx.new_function(socket_gethostbyaddr),
+        // non-redox constants
+        "MSG_OOB" => ctx.new_int(c::MSG_OOB),
+        "MSG_WAITALL" => ctx.new_int(c::MSG_WAITALL),
+        "AI_ALL" => ctx.new_int(c::AI_ALL),
+        "AI_PASSIVE" => ctx.new_int(c::AI_PASSIVE),
+        "IPPROTO_NONE" => ctx.new_int(c::IPPROTO_NONE),
     });
 
     extend_module_platform_specific(vm, &module);