diff --git a/Cargo.toml b/Cargo.toml index 08c44e7403..460a7730bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,4 +5,4 @@ authors = ["Jeremy Soller "] edition = "2018" [dependencies] -redox_syscall = "0.1" +redox_syscall = "0.2.9" diff --git a/src/main.rs b/src/main.rs index bb5b3ca35e..12148c9b75 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ use std::{fs, io, mem, process, slice, thread}; use std::io::{Read, Write}; use std::sync::{Arc, Mutex}; use syscall::data::{Packet, SigAction}; -use syscall::flag::{O_CLOEXEC, SIGUSR1}; +use syscall::flag::{CloneFlags, SigActionFlags, O_CLOEXEC, SIGUSR1}; use syscall::scheme::SchemeBlockMut; use self::scheme::AudioScheme; @@ -40,9 +40,9 @@ fn thread(scheme: Arc>, pid: usize, mut hda_file: fs::File) - fn daemon(pipe_fd: usize) -> io::Result<()> { // Handle signals from the hda thread syscall::sigaction(SIGUSR1, Some(&SigAction { - sa_handler: sigusr_handler, + sa_handler: Some(sigusr_handler), sa_mask: [0; 2], - sa_flags: 0, + sa_flags: SigActionFlags::empty(), }), None).map_err(from_syscall_error)?; let pid = syscall::getpid().map_err(from_syscall_error)?; @@ -104,7 +104,7 @@ fn audiod() -> io::Result<()> { syscall::pipe2(&mut pipe, O_CLOEXEC).map_err(from_syscall_error)?; // Daemonize - if unsafe { syscall::clone(0) }.map_err(from_syscall_error)? == 0 { + if unsafe { syscall::clone(CloneFlags::empty()) }.map_err(from_syscall_error)? == 0 { let _ = syscall::close(pipe[0]); return daemon(pipe[1]); } else { diff --git a/src/scheme.rs b/src/scheme.rs index b9da7a0524..5590146697 100644 --- a/src/scheme.rs +++ b/src/scheme.rs @@ -47,7 +47,7 @@ impl AudioScheme { } impl SchemeBlockMut for AudioScheme { - fn open(&mut self, _path: &[u8], flags: usize, _uid: u32, _gid: u32) -> Result> { + fn open(&mut self, _path: &str, flags: usize, _uid: u32, _gid: u32) -> Result> { self.next_id += 1; let id = self.next_id;