alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-23 00:00:02 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Avoid casting away const when processing C command args

Browse Source
This commit is contained in:
Wesley Moore 2024-03-13 20:07:07 +10:00
parent 6a41851118
commit 888321446d
No known key found for this signature in database
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bcachefs.rs
View File

@ -2,7 +2,7 @@ mod wrappers;
mod commands; mod commands;
mod key; mod key;
use std::ffi::CString; use std::ffi::{c_char, CString};
use commands::cmd_completions::cmd_completions; use commands::cmd_completions::cmd_completions;
use commands::cmd_list::cmd_list; use commands::cmd_list::cmd_list;
@ -21,13 +21,7 @@ impl std::fmt::Display for ErrnoError {
impl std::error::Error for ErrnoError {} impl std::error::Error for ErrnoError {}
fn to_mut<T>(p: *const T) -> *mut T { fn handle_c_command(mut argv: Vec<String>, symlink_cmd: Option<&str>) -> i32 {
p as *mut T
}
fn handle_c_command(args: Vec<String>, symlink_cmd: Option<&str>) -> i32 {
let mut argv: Vec<_> = args.clone();
let cmd = match symlink_cmd { let cmd = match symlink_cmd {
Some(s) => s.to_string(), Some(s) => s.to_string(),
None => argv.remove(1), None => argv.remove(1),
@ -36,10 +30,13 @@ fn handle_c_command(args: Vec<String>, symlink_cmd: Option<&str>) -> i32 {
let argc: i32 = argv.len().try_into().unwrap(); let argc: i32 = argv.len().try_into().unwrap();
let argv: Vec<_> = argv let argv: Vec<_> = argv
.iter() .into_iter()
.map(|s| CString::new(s.as_str()).unwrap()) .map(|s| CString::new(s).unwrap())
.collect(); .collect();
let mut argv: Vec<_> = argv.iter().map(|s| to_mut(s.as_ptr())).collect(); let mut argv = argv
.into_iter()
.map(|s| Box::into_raw(s.into_boxed_c_str()) as *mut c_char)
.collect::<Box<[*mut c_char]>>();
let argv = argv.as_mut_ptr(); let argv = argv.as_mut_ptr();
// The C functions will mutate argv. It shouldn't be used after this block. // The C functions will mutate argv. It shouldn't be used after this block.