diff --git a/src/crt0/src/lib.rs b/src/crt0/src/lib.rs index ceb003f96d6d443504f8dba12f29901da6807768..e790ec60d0d8f69b173a7782306b389f20beab07 100644 --- a/src/crt0/src/lib.rs +++ b/src/crt0/src/lib.rs @@ -98,7 +98,9 @@ pub unsafe extern "C" fn _start_rust(sp: &'static Stack) -> ! { platform::exit(main( argc, argv, - envp + // not envp, because programs like bash try to modify this *const* + // pointer :| + platform::environ as *const *const c_char )); } diff --git a/src/platform/src/redox/mod.rs b/src/platform/src/redox/mod.rs index 19c02b306b518e8d0472e39ba4a4571e0b2f97d0..1f4b996ace2e0493ae35bb703a5eb108b737c8c3 100644 --- a/src/platform/src/redox/mod.rs +++ b/src/platform/src/redox/mod.rs @@ -219,7 +219,7 @@ pub unsafe extern "C" fn execve( while *arg.offset(len) != 0 { len += 1; } - args.push([*arg as usize, len as usize]); + args.push([arg as usize, len as usize]); argv = argv.offset(1); } @@ -236,7 +236,7 @@ pub unsafe extern "C" fn execve( while *env.offset(len) != 0 { len += 1; } - envs.push([*env as usize, len as usize]); + envs.push([env as usize, len as usize]); envp = envp.offset(1); }