bonsai/harakit
5
4
Fork 3
Code Issues 41 Pull Requests 7 Projects 1 Releases 30 Activity

getopt.rs(3): refactor to remove as much as possible from unsafe

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

35
src/getopt.rs
View File

@ -31,31 +31,24 @@ pub enum OptError {
// Function signature
pub trait GetOpt {
fn getopt(
argv: Vec<String>,
optstring: &str
) -> Option<Result<Opt, OptError>>;
fn getopt(&self, optstring: &str) -> Option<Result<Opt, OptError>>;
}
impl GetOpt for Vec<String> {
fn getopt(
argv: Vec<String>,
optstring: &str
) -> Option<Result<Opt, OptError>> {
fn getopt(&self, optstring: &str) -> Option<Result<Opt, OptError>> {
let argv = self
.iter()
.cloned()
.map(CString::new)
.map(Result::unwrap)
.map(|x| x.as_ptr() as c_char)
.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 args = argv
.iter()
.cloned()
.map(CString::new)
.map(Result::unwrap)
.map(|x| x.as_ptr() as c_char)
.collect::<Vec<c_char>>()
.as_ptr() as *const *mut c_char;
let len = argv.len() as c_int;
let opts = CString::new(optstring).unwrap().into_raw();
let a = match getopt(len, args, opts) {
let a = match getopt(len, argv, opts) {
/* From getopt(3p):
*
* The getopt() function shall return the next option character