use crate::sys::process::zircon::*;
let envp = match maybe_envp {
- Some(envp) => envp.as_ptr(),
+ // None means to clone the current environment, which is done in the
+ // flags below.
None => ptr::null(),
+ Some(envp) => envp.as_ptr(),
};
- let transfer_or_clone = |opt_fd, target_fd| if let Some(local_fd) = opt_fd {
- fdio_spawn_action_t {
- action: FDIO_SPAWN_ACTION_TRANSFER_FD,
- local_fd,
- target_fd,
- ..Default::default()
- }
- } else {
- fdio_spawn_action_t {
- action: FDIO_SPAWN_ACTION_CLONE_FD,
- local_fd: target_fd,
- target_fd,
- ..Default::default()
+ let make_action = |local_io: &ChildStdio, target_fd| -> io::Result<fdio_spawn_action_t> {
+ if let Some(local_fd) = local_io.fd() {
+ Ok(fdio_spawn_action_t {
+ action: FDIO_SPAWN_ACTION_TRANSFER_FD,
+ local_fd,
+ target_fd,
+ ..Default::default()
+ })
+ } else {
+ if let ChildStdio::Null = local_io {
+ // acts as no-op
+ return Ok(Default::default());
+ }
+
+ let mut handle = ZX_HANDLE_INVALID;
+ let status = fdio_fd_clone(target_fd, &mut handle);
+ if status == ERR_INVALID_ARGS || status == ERR_NOT_SUPPORTED {
+ // This descriptor is closed; skip it rather than generating an
+ // error.
+ return Ok(Default::default());
+ }
+ zx_cvt(status)?;
+
+ let mut cloned_fd = 0;
+ zx_cvt(fdio_fd_create(handle, &mut cloned_fd))?;
+
+ Ok(fdio_spawn_action_t {
+ action: FDIO_SPAWN_ACTION_TRANSFER_FD,
+ local_fd: cloned_fd as i32,
+ target_fd,
+ ..Default::default()
+ })
}
};
// Clone stdin, stdout, and stderr
- let action1 = transfer_or_clone(stdio.stdin.fd(), 0);
- let action2 = transfer_or_clone(stdio.stdout.fd(), 1);
- let action3 = transfer_or_clone(stdio.stderr.fd(), 2);
+ let action1 = make_action(&stdio.stdin, 0)?;
+ let action2 = make_action(&stdio.stdout, 1)?;
+ let action3 = make_action(&stdio.stderr, 2)?;
let actions = [action1, action2, action3];
// We don't want FileDesc::drop to be called on any stdio. fdio_spawn_etc
let mut process_handle: zx_handle_t = 0;
zx_cvt(fdio_spawn_etc(
- 0,
- FDIO_SPAWN_CLONE_JOB | FDIO_SPAWN_CLONE_LDSVC | FDIO_SPAWN_CLONE_NAMESPACE,
- self.get_argv()[0], self.get_argv().as_ptr(), envp, 3, actions.as_ptr(),
+ ZX_HANDLE_INVALID,
+ FDIO_SPAWN_CLONE_JOB | FDIO_SPAWN_CLONE_LDSVC | FDIO_SPAWN_CLONE_NAMESPACE
+ | FDIO_SPAWN_CLONE_ENVIRON, // this is ignored when envp is non-null
+ self.get_argv()[0], self.get_argv().as_ptr(), envp,
+ actions.len() as size_t, actions.as_ptr(),
&mut process_handle,
ptr::null_mut(),
))?;