RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-09-15 03:26:18 +00:00
Code Issues Activity

core/entries: disable missing group functions on redox

Browse source
This commit is contained in:
Jeremy Soller 2021-08-06 13:33:54 -06:00
parent ed6a9d4c57
commit cc0e1e3458
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,9 @@
#[cfg(any(target_os = "freebsd", target_vendor = "apple"))] #[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
use libc::time_t; use libc::time_t;
use libc::{c_char, c_int, gid_t, uid_t}; use libc::{c_char, c_int, gid_t, uid_t};
use libc::{getgrgid, getgrnam, getgroups, getpwnam, getpwuid, group, passwd}; #[cfg(not(target_os = "redox"))]
use libc::{getgrgid, getgrnam, getgroups};
use libc::{getpwnam, getpwuid, group, passwd};
use std::borrow::Cow; use std::borrow::Cow;
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
@ -65,6 +67,7 @@ extern "C" {
/// > supplementary group IDs for the process is returned. This allows /// > supplementary group IDs for the process is returned. This allows
/// > the caller to determine the size of a dynamically allocated list /// > the caller to determine the size of a dynamically allocated list
/// > to be used in a further call to getgroups(). /// > to be used in a further call to getgroups().
#[cfg(not(target_os = "redox"))]
pub fn get_groups() -> IOResult<Vec<gid_t>> { pub fn get_groups() -> IOResult<Vec<gid_t>> {
let ngroups = unsafe { getgroups(0, ptr::null_mut()) }; let ngroups = unsafe { getgroups(0, ptr::null_mut()) };
if ngroups == -1 { if ngroups == -1 {
@ -104,7 +107,7 @@ pub fn get_groups() -> IOResult<Vec<gid_t>> {
/// > groups is the same (in the mathematical sense of ``set''). (The /// > groups is the same (in the mathematical sense of ``set''). (The
/// > history of a process and its parents could affect the details of /// > history of a process and its parents could affect the details of
/// > the result.) /// > the result.)
#[cfg(all(unix, feature = "process"))] #[cfg(all(unix, not(target_os = "redox"), feature = "process"))]
pub fn get_groups_gnu(arg_id: Option<u32>) -> IOResult<Vec<gid_t>> { pub fn get_groups_gnu(arg_id: Option<u32>) -> IOResult<Vec<gid_t>> {
let groups = get_groups()?; let groups = get_groups()?;
let egid = arg_id.unwrap_or_else(crate::features::process::getegid); let egid = arg_id.unwrap_or_else(crate::features::process::getegid);
@ -319,6 +322,7 @@ macro_rules! f {
} }
f!(getpwnam, getpwuid, uid_t, Passwd); f!(getpwnam, getpwuid, uid_t, Passwd);
#[cfg(not(target_os = "redox"))]
f!(getgrnam, getgrgid, gid_t, Group); f!(getgrnam, getgrgid, gid_t, Group);
#[inline] #[inline]
@ -326,6 +330,7 @@ pub fn uid2usr(id: uid_t) -> IOResult<String> {
Passwd::locate(id).map(|p| p.name().into_owned()) Passwd::locate(id).map(|p| p.name().into_owned())
} }
#[cfg(not(target_os = "redox"))]
#[inline] #[inline]
pub fn gid2grp(id: gid_t) -> IOResult<String> { pub fn gid2grp(id: gid_t) -> IOResult<String> {
Group::locate(id).map(|p| p.name().into_owned()) Group::locate(id).map(|p| p.name().into_owned())
@ -336,6 +341,7 @@ pub fn usr2uid(name: &str) -> IOResult<uid_t> {
Passwd::locate(name).map(|p| p.uid()) Passwd::locate(name).map(|p| p.uid())
} }
#[cfg(not(target_os = "redox"))]
#[inline] #[inline]
pub fn grp2gid(name: &str) -> IOResult<gid_t> { pub fn grp2gid(name: &str) -> IOResult<gid_t> {
Group::locate(name).map(|p| p.gid()) Group::locate(name).map(|p| p.gid())