trinity/bonsix
1
0
Fork 0
forked from bonsai/harakit
Code Pull Requests Activity

getopt.rs(3): fixed pointer shenanigans

Browse Source
This commit is contained in:
Emma Tebibyte 2024-04-11 20:33:42 -06:00
parent 88b0d55440
commit bb2c63bfaf
Signed by untrusted user: emma
GPG Key ID: 06FA419A1698C270
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/getopt.rs
View File

@ -16,7 +16,7 @@
* along with this program. If not, see https://www.gnu.org/licenses/. * along with this program. If not, see https://www.gnu.org/licenses/.
*/ */
use std::ffi::{ c_int, c_char, CString }; use std::ffi::{ c_int, c_char, CString, CStr };
pub struct Opt { pub struct Opt {
pub arg: Option<String>, pub arg: Option<String>,
@ -35,20 +35,22 @@ pub trait GetOpt {
} }
impl GetOpt for Vec<String> { impl GetOpt for Vec<String> {
fn getopt(&self, optstring: &str) -> Option<Result<Opt, OptError>> { fn getopt(&self, optstring: &str) -> Option<Result<Opt, OptError>> {
let argv = self let c_strings: Vec<_> = self
.iter() .iter()
.cloned() .cloned()
.map(CString::new) .map(CString::new)
.map(Result::unwrap) .map(Result::unwrap)
.map(|x| x.as_ptr() as c_char) .collect();
.collect::<Vec<c_char>>()
.as_ptr() as *const *mut c_char;
let opts = CString::new(optstring).unwrap().into_raw();
let len = self.len() as c_int;
unsafe { let argv: Vec<_> = c_strings.iter().map(|x| x.as_ptr()).collect();
let a = match getopt(len, argv, opts) { let argv_ptr = argv.as_ptr() as *const *mut c_char;
let optstring_c = CString::new(optstring).unwrap();
let opts = optstring_c.into_raw();
let len = self.len() as c_int;
unsafe {
let a = match getopt(len, argv_ptr, opts) {
/* From getopt(3p): /* From getopt(3p):
* *
* The getopt() function shall return the next option character * The getopt() function shall return the next option character
@ -65,11 +67,11 @@ impl GetOpt for Vec<String> {
* *
* Otherwise, getopt() shall return -1 when all command line * Otherwise, getopt() shall return -1 when all command line
* options are parsed. */ * options are parsed. */
58 => { // ASCII value for ':' 58 => { /* ASCII value for ':' */
return Some(Err(OptError::MissingArg)); return Some(Err(OptError::MissingArg));
}, },
63 => { // ASCII value for '?' 63 => { /* ASCII value for '?' */
return Some(Err(OptError::UnknownOpt)); return Some(Err(OptError::UnknownOpt))
}, },
/* From getopt(3p): /* From getopt(3p):
* *
@ -84,18 +86,17 @@ impl GetOpt for Vec<String> {
* argv[optind] points to the string "--" * argv[optind] points to the string "--"
* *
* getopt() shall return -1 after incrementing optind. */ * getopt() shall return -1 after incrementing optind. */
-1 => return None, -1 => return None,
a => a.to_string(), _ => CStr::from_ptr(optarg).to_string_lossy().into_owned(),
}; };
Some(Ok(Opt { arg: Some(a), ind: optind, opt: optopt })) Some(Ok(Opt { arg: Some(a), ind: optind, opt: optopt }))
} }
} }
} }
/* binding to getopt(3p) */ /* binding to getopt(3p) */
extern "C" { extern "C" {
static mut _optarg: *mut c_char; static mut optarg: *mut c_char;
static mut _opterr: c_int; static mut _opterr: c_int;
static mut optind: c_int; static mut optind: c_int;
static mut optopt: c_int; static mut optopt: c_int;