RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 20:17:45 +00:00
Code Issues Activity

uucore::entries: Remove unnecessary unsafe Vec operations

Browse source
This commit is contained in:
Jan Verbeek 2021-08-27 14:38:05 +02:00
parent f2ddae93fa
commit 412a81e7bf
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/uucore/src/lib/features/entries.rs
View file

@ -41,6 +41,7 @@ use libc::{c_char, c_int, gid_t, uid_t};
use libc::{getgrgid, getgrnam, getgroups}; use libc::{getgrgid, getgrnam, getgroups};
use libc::{getpwnam, getpwuid, group, passwd}; use libc::{getpwnam, getpwuid, group, passwd};
use std::convert::TryInto;
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::io::Error as IOError; use std::io::Error as IOError;
use std::io::ErrorKind; use std::io::ErrorKind;
@ -75,14 +76,14 @@ pub fn get_groups() -> IOResult<Vec<gid_t>> {
if ngroups == -1 { if ngroups == -1 {
return Err(IOError::last_os_error()); return Err(IOError::last_os_error());
} }
let mut groups = Vec::with_capacity(ngroups as usize); let mut groups = vec![0; ngroups.try_into().unwrap()];
let ngroups = unsafe { getgroups(ngroups, groups.as_mut_ptr()) }; let ngroups = unsafe { getgroups(ngroups, groups.as_mut_ptr()) };
if ngroups == -1 { if ngroups == -1 {
Err(IOError::last_os_error()) Err(IOError::last_os_error())
} else { } else {
unsafe { let ngroups = ngroups.try_into().unwrap();
groups.set_len(ngroups as usize); assert!(ngroups <= groups.len());
} groups.truncate(ngroups);
Ok(groups) Ok(groups)
} }
} }
@ -196,7 +197,7 @@ impl Passwd {
pub fn belongs_to(&self) -> Vec<gid_t> { pub fn belongs_to(&self) -> Vec<gid_t> {
let mut ngroups: c_int = 8; let mut ngroups: c_int = 8;
let mut ngroups_old: c_int; let mut ngroups_old: c_int;
let mut groups = Vec::with_capacity(ngroups as usize); let mut groups = vec![0; ngroups.try_into().unwrap()];
let name = CString::new(self.name.clone()).unwrap(); let name = CString::new(self.name.clone()).unwrap();
loop { loop {
ngroups_old = ngroups; ngroups_old = ngroups;
@ -206,15 +207,14 @@ impl Passwd {
if ngroups == ngroups_old { if ngroups == ngroups_old {
ngroups *= 2; ngroups *= 2;
} }
groups.resize(ngroups as usize, 0); groups.resize(ngroups.try_into().unwrap(), 0);
} else { } else {
break; break;
} }
} }
unsafe { let ngroups = ngroups.try_into().unwrap();
groups.set_len(ngroups as usize); assert!(ngroups <= groups.len());
} groups.truncate(ngroups);
groups.truncate(ngroups as usize);
groups groups
} }
} }