From 058a0f0b0bb1c39d620f7ce1d81150141c6a6341 Mon Sep 17 00:00:00 2001 From: Geoffrey Thomas Date: Fri, 19 Jun 2015 21:11:10 -0400 Subject: liblibc: Fix prototype of functions taking `char *const argv[]` The execv family of functions do not modify their arguments, so they do not need mutable pointers. The C prototypes take a constant array of mutable C-strings, but that's a legacy quirk from before C had const (since C string literals have type `char *`). The Rust prototypes had `*mut` in the wrong place, anyway: to match the C prototypes, it should have been `*const *mut c_char`. But it is safe to pass constant strings (like string literals) to these functions. getopt is a special case, since GNU getopt modifies its arguments despite the `const` claim in the prototype. It is apparently only well-defined to call getopt on the actual argc and argv parameters passed to main, anyway. Change it to take `*mut *mut c_char` for an attempt at safety, but probably nobody should be using it from Rust, since there's no great way to get at the parameters as passed to main. Also fix the one caller of execvp in libstd, which now no longer needs an unsafe cast. Fixes #16290. --- src/libstd/sys/unix/process.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libstd/sys') diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index 9178ca7aba4..acf6fbc24e4 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -313,7 +313,7 @@ impl Process { if !envp.is_null() { *sys::os::environ() = envp as *const _; } - let _ = libc::execvp(*argv, argv as *mut _); + let _ = libc::execvp(*argv, argv); fail(&mut output) } -- cgit 1.4.1-3-g733a5