Skip to content

Rollup of 8 pull requests #61018

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 22 commits into from
Closed

Rollup of 8 pull requests #61018

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
af6ace6
convert custom try macro to `?`
hellow554 May 6, 2019
5458b65
use exhaustive_patterns to be able to use `?`
hellow554 May 6, 2019
c5d9401
Avoid symbol interning in `file_metadata`.
nnethercote May 6, 2019
a7e1431
Update boxed::Box docs on memory layout
blkerby May 19, 2019
178b753
Remove trailing whitespaces to satisfy tidy
blkerby May 19, 2019
d320c7c
Do not fail on child without DefId
estebank May 20, 2019
419ca9d
LocalDecl push returns Local len
spastorino May 20, 2019
4e37785
Create and reference Memory Layout section of boxed docs
blkerby May 21, 2019
e186d3f
Add stream_to_parser_with_base_dir
topecongiro May 21, 2019
5ea5fe3
static_assert: make use of anonymous constants
RalfJung May 21, 2019
61735ab
adjust deprecation date of mem::uninitialized
RalfJung May 21, 2019
b07dbe1
Add doc comment
topecongiro May 21, 2019
1f1a917
Fix tidy: remove a trailing whitespace
topecongiro May 21, 2019
a2168b0
update doc comment
RalfJung May 21, 2019
ea01af4
Rollup merge of #60581 - hellow554:fix_60580, r=alexcrichton
Centril May 21, 2019
bb03f31
Rollup merge of #60963 - blkerby:boxed_docs, r=alexcrichton
Centril May 21, 2019
cd84e24
Rollup merge of #60973 - nnethercote:fix-file_metadata-more, r=michae…
Centril May 21, 2019
c09259c
Rollup merge of #60982 - estebank:fix-60976, r=petrochenkov
Centril May 21, 2019
d152bf2
Rollup merge of #60991 - spastorino:local-decls-push, r=oli-obk
Centril May 21, 2019
36680df
Rollup merge of #60995 - topecongiro:parser-from-stream-and-base-dir,…
Centril May 21, 2019
557af5b
Rollup merge of #60998 - RalfJung:static_assert, r=Centril
Centril May 21, 2019
d504b33
Rollup merge of #61006 - RalfJung:maybe-uninit, r=Centril
Centril May 21, 2019
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
65 changes: 30 additions & 35 deletions src/libstd/sys/redox/process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ impl Command {
match cvt(syscall::clone(0))? {
0 => {
drop(input);
let err = self.do_exec(theirs);
let Err(err) = self.do_exec(theirs);
let errno = err.raw_os_error().unwrap_or(syscall::EINVAL) as u32;
let bytes = [
(errno >> 24) as u8,
Expand Down Expand Up @@ -218,7 +218,10 @@ impl Command {
}

match self.setup_io(default, true) {
Ok((_, theirs)) => unsafe { self.do_exec(theirs) },
Ok((_, theirs)) => unsafe {
let Err(e) = self.do_exec(theirs);
e
},
Err(e) => e,
}
}
Expand Down Expand Up @@ -253,45 +256,38 @@ impl Command {
// allocation). Instead we just close it manually. This will never
// have the drop glue anyway because this code never returns (the
// child will either exec() or invoke syscall::exit)
unsafe fn do_exec(&mut self, stdio: ChildPipes) -> io::Error {
macro_rules! t {
($e:expr) => (match $e {
Ok(e) => e,
Err(e) => return e,
})
}

unsafe fn do_exec(&mut self, stdio: ChildPipes) -> Result<!, io::Error> {
if let Some(fd) = stdio.stderr.fd() {
t!(cvt(syscall::dup2(fd, 2, &[])));
let mut flags = t!(cvt(syscall::fcntl(2, syscall::F_GETFD, 0)));
cvt(syscall::dup2(fd, 2, &[]))?;
let mut flags = cvt(syscall::fcntl(2, syscall::F_GETFD, 0))?;
flags &= ! syscall::O_CLOEXEC;
t!(cvt(syscall::fcntl(2, syscall::F_SETFD, flags)));
cvt(syscall::fcntl(2, syscall::F_SETFD, flags))?;
}
if let Some(fd) = stdio.stdout.fd() {
t!(cvt(syscall::dup2(fd, 1, &[])));
let mut flags = t!(cvt(syscall::fcntl(1, syscall::F_GETFD, 0)));
cvt(syscall::dup2(fd, 1, &[]))?;
let mut flags = cvt(syscall::fcntl(1, syscall::F_GETFD, 0))?;
flags &= ! syscall::O_CLOEXEC;
t!(cvt(syscall::fcntl(1, syscall::F_SETFD, flags)));
cvt(syscall::fcntl(1, syscall::F_SETFD, flags))?;
}
if let Some(fd) = stdio.stdin.fd() {
t!(cvt(syscall::dup2(fd, 0, &[])));
let mut flags = t!(cvt(syscall::fcntl(0, syscall::F_GETFD, 0)));
cvt(syscall::dup2(fd, 0, &[]))?;
let mut flags = cvt(syscall::fcntl(0, syscall::F_GETFD, 0))?;
flags &= ! syscall::O_CLOEXEC;
t!(cvt(syscall::fcntl(0, syscall::F_SETFD, flags)));
cvt(syscall::fcntl(0, syscall::F_SETFD, flags))?;
}

if let Some(g) = self.gid {
t!(cvt(syscall::setregid(g as usize, g as usize)));
cvt(syscall::setregid(g as usize, g as usize))?;
}
if let Some(u) = self.uid {
t!(cvt(syscall::setreuid(u as usize, u as usize)));
cvt(syscall::setreuid(u as usize, u as usize))?;
}
if let Some(ref cwd) = self.cwd {
t!(cvt(syscall::chdir(cwd)));
cvt(syscall::chdir(cwd))?;
}

for callback in self.closures.iter_mut() {
t!(callback());
callback()?;
}

self.env.apply();
Expand All @@ -313,9 +309,9 @@ impl Command {
};

let mut file = if let Some(program) = program {
t!(File::open(program.as_os_str()))
File::open(program.as_os_str())?
} else {
return io::Error::from_raw_os_error(syscall::ENOENT);
return Err(io::Error::from_raw_os_error(syscall::ENOENT));
};

// Push all the arguments
Expand All @@ -327,7 +323,7 @@ impl Command {
let mut shebang = [0; 2];
let mut read = 0;
loop {
match t!(reader.read(&mut shebang[read..])) {
match reader.read(&mut shebang[read..])? {
0 => break,
n => read += n,
}
Expand All @@ -338,9 +334,9 @@ impl Command {
// First of all, since we'll be passing another file to
// fexec(), we need to manually check that we have permission
// to execute this file:
let uid = t!(cvt(syscall::getuid()));
let gid = t!(cvt(syscall::getgid()));
let meta = t!(file.metadata());
let uid = cvt(syscall::getuid())?;
let gid = cvt(syscall::getgid())?;
let meta = file.metadata()?;

let mode = if uid == meta.uid() as usize {
meta.mode() >> 3*2 & 0o7
Expand All @@ -350,12 +346,12 @@ impl Command {
meta.mode() & 0o7
};
if mode & 1 == 0 {
return io::Error::from_raw_os_error(syscall::EPERM);
return Err(io::Error::from_raw_os_error(syscall::EPERM));
}

// Second of all, we need to actually read which interpreter it wants
let mut interpreter = Vec::new();
t!(reader.read_until(b'\n', &mut interpreter));
reader.read_until(b'\n', &mut interpreter)?;
// Pop one trailing newline, if any
if interpreter.ends_with(&[b'\n']) {
interpreter.pop().unwrap();
Expand All @@ -373,11 +369,11 @@ impl Command {
};
if let Some(ref interpreter) = interpreter {
let path: &OsStr = OsStr::from_bytes(&interpreter);
file = t!(File::open(path));
file = File::open(path)?;

args.push([interpreter.as_ptr() as usize, interpreter.len()]);
} else {
t!(file.seek(SeekFrom::Start(0)));
file.seek(SeekFrom::Start(0))?;
}

args.push([self.program.as_ptr() as usize, self.program.len()]);
Expand All @@ -396,13 +392,12 @@ impl Command {
}

if let Err(err) = syscall::fexec(file.as_raw_fd(), &args, &vars) {
io::Error::from_raw_os_error(err.errno as i32)
Err(io::Error::from_raw_os_error(err.errno as i32))
} else {
panic!("return from exec without err");
}
}


fn setup_io(&self, default: Stdio, needs_stdin: bool)
-> io::Result<(StdioPipes, ChildPipes)> {
let null = Stdio::Null;
Expand Down
38 changes: 16 additions & 22 deletions src/libstd/sys/unix/process/process_unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ impl Command {
match result {
0 => {
drop(input);
let err = self.do_exec(theirs, envp.as_ref());
let Err(err) = self.do_exec(theirs, envp.as_ref());
let errno = err.raw_os_error().unwrap_or(libc::EINVAL) as u32;
let bytes = [
(errno >> 24) as u8,
Expand Down Expand Up @@ -123,7 +123,8 @@ impl Command {
// environment lock before we try to exec.
let _lock = sys::os::env_lock();

self.do_exec(theirs, envp.as_ref())
let Err(e) = self.do_exec(theirs, envp.as_ref());
e
}
}
Err(e) => e,
Expand Down Expand Up @@ -164,29 +165,22 @@ impl Command {
&mut self,
stdio: ChildPipes,
maybe_envp: Option<&CStringArray>
) -> io::Error {
) -> Result<!, io::Error> {
use crate::sys::{self, cvt_r};

macro_rules! t {
($e:expr) => (match $e {
Ok(e) => e,
Err(e) => return e,
})
}

if let Some(fd) = stdio.stdin.fd() {
t!(cvt_r(|| libc::dup2(fd, libc::STDIN_FILENO)));
cvt_r(|| libc::dup2(fd, libc::STDIN_FILENO))?;
}
if let Some(fd) = stdio.stdout.fd() {
t!(cvt_r(|| libc::dup2(fd, libc::STDOUT_FILENO)));
cvt_r(|| libc::dup2(fd, libc::STDOUT_FILENO))?;
}
if let Some(fd) = stdio.stderr.fd() {
t!(cvt_r(|| libc::dup2(fd, libc::STDERR_FILENO)));
cvt_r(|| libc::dup2(fd, libc::STDERR_FILENO))?;
}

if cfg!(not(any(target_os = "l4re"))) {
if let Some(u) = self.get_gid() {
t!(cvt(libc::setgid(u as gid_t)));
cvt(libc::setgid(u as gid_t))?;
}
if let Some(u) = self.get_uid() {
// When dropping privileges from root, the `setgroups` call
Expand All @@ -198,11 +192,11 @@ impl Command {
// privilege dropping function.
let _ = libc::setgroups(0, ptr::null());

t!(cvt(libc::setuid(u as uid_t)));
cvt(libc::setuid(u as uid_t))?;
}
}
if let Some(ref cwd) = *self.get_cwd() {
t!(cvt(libc::chdir(cwd.as_ptr())));
cvt(libc::chdir(cwd.as_ptr()))?;
}

// emscripten has no signal support.
Expand All @@ -225,18 +219,18 @@ impl Command {
0,
mem::size_of::<libc::sigset_t>());
} else {
t!(cvt(libc::sigemptyset(&mut set)));
cvt(libc::sigemptyset(&mut set))?;
}
t!(cvt(libc::pthread_sigmask(libc::SIG_SETMASK, &set,
ptr::null_mut())));
cvt(libc::pthread_sigmask(libc::SIG_SETMASK, &set,
ptr::null_mut()))?;
let ret = sys::signal(libc::SIGPIPE, libc::SIG_DFL);
if ret == libc::SIG_ERR {
return io::Error::last_os_error()
return Err(io::Error::last_os_error())
}
}

for callback in self.get_closures().iter_mut() {
t!(callback());
callback()?;
}

// Although we're performing an exec here we may also return with an
Expand All @@ -261,7 +255,7 @@ impl Command {
}

libc::execvp(self.get_argv()[0], self.get_argv().as_ptr());
io::Error::last_os_error()
Err(io::Error::last_os_error())
}

#[cfg(not(any(target_os = "macos", target_os = "freebsd",
Expand Down