Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e20f630
pass the captured environment variables to rtpSpawn
BaoshanPang Nov 4, 2019
de362b4
ensure that access to the environment is synchronized
BaoshanPang Nov 20, 2019
481b18a
Small error codes explanation cleanup (E0092, E0093 and E0094)
GuillaumeGomez Nov 30, 2019
b1ececa
[CI] fix the `! isCI` check in src/ci/run.sh
cuviper Dec 2, 2019
7693bb9
Add long error for E0631 and update ui tests.
reese Dec 3, 2019
26a1ba8
Use simpler code example for E0631 long error.
reese Dec 3, 2019
3091b82
Tweak wording of `collect()` on bad target type
estebank Nov 26, 2019
79849ee
add ExitStatusExt into prelude
BaoshanPang Dec 3, 2019
911b7d6
Update missed test.
reese Dec 3, 2019
c911bb1
clean up E0107 error explanation
GuillaumeGomez Nov 30, 2019
c2ce7dd
Clean up E0116 error code long explanation
GuillaumeGomez Dec 4, 2019
1e5450d
Clean up E0117 error code long explanation
GuillaumeGomez Dec 4, 2019
9eaea4d
Clean up E0118 error code long explanation
GuillaumeGomez Dec 4, 2019
ae753a5
some error codes long explanation
GuillaumeGomez Dec 4, 2019
8be7223
Fix docs for formatting delegations
elichai Dec 4, 2019
28b37a2
Merge pull request #46 from Wind-River/master_base_V7LIBC-1069
n-salim Dec 5, 2019
f7789ad
Fix fetching arguments on the wasm32-wasi target
alexcrichton Dec 5, 2019
db7b0f8
Update the revision of wasi-libc used in wasm32-wasi
alexcrichton Dec 5, 2019
617b07e
Rollup merge of #66649 - Wind-River:master_xyz, r=alexcrichton
JohnTitor Dec 6, 2019
3d2cb55
Rollup merge of #66764 - estebank:reword-bad-collect, r=alexcrichton
JohnTitor Dec 6, 2019
c31773c
Rollup merge of #66900 - GuillaumeGomez:clean-up-err-codes, r=Dylan-DPC
JohnTitor Dec 6, 2019
3b878aa
Rollup merge of #66974 - cuviper:not-isCI, r=alexcrichton
JohnTitor Dec 6, 2019
6c0165f
Rollup merge of #66979 - reese:E0631-long-error, r=GuillaumeGomez
JohnTitor Dec 6, 2019
662a225
Rollup merge of #67017 - GuillaumeGomez:long-err-explanations-2, r=Dy…
JohnTitor Dec 6, 2019
f7c2631
Rollup merge of #67021 - elichai:2019-12-fmt, r=QuietMisdreavus
JohnTitor Dec 6, 2019
1bb868c
Rollup merge of #67041 - Wind-River:master_base, r=alexcrichton
JohnTitor Dec 6, 2019
f77b8d3
Rollup merge of #67065 - alexcrichton:update-wasi, r=sfackler
JohnTitor Dec 6, 2019
acd2b08
Rollup merge of #67066 - alexcrichton:update-wasi-libc, r=Mark-Simula…
JohnTitor Dec 6, 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
Next Next commit
pass the captured environment variables to rtpSpawn
  • Loading branch information
BaoshanPang committed Nov 22, 2019
commit e20f630f1caf7e95a725ed524109fc168a9e1345
6 changes: 5 additions & 1 deletion src/libstd/sys/vxworks/process/process_vxworks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ impl Command {
-> io::Result<(Process, StdioPipes)> {
use crate::sys::{cvt_r};
const CLOEXEC_MSG_FOOTER: &'static [u8] = b"NOEX";
let envp = self.capture_env();

if self.saw_nul() {
return Err(io::Error::new(ErrorKind::InvalidInput,
Expand Down Expand Up @@ -52,10 +53,13 @@ impl Command {
t!(cvt(libc::chdir(cwd.as_ptr())));
}

let c_envp = envp.as_ref().map(|c| c.as_ptr())
.unwrap_or_else(|| *sys::os::environ() as *const _);

let ret = libc::rtpSpawn(
self.get_argv()[0], // executing program
self.get_argv().as_ptr() as *mut *const c_char, // argv
*sys::os::environ() as *mut *const c_char,
c_envp as *mut *const c_char,
100 as c_int, // initial priority
thread::min_stack(), // initial stack size.
0, // options
Expand Down