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

id: use libc::{uid_t,gid_t} where appropriate

Browse source
This commit is contained in:
Michael Gehring 2014-06-16 22:09:04 +02:00
parent b39cf18418
commit 68c42a6a39
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
id/id.rs
View file

@ -23,6 +23,7 @@ use std::ptr::read;
use libc::{ use libc::{
c_char, c_char,
c_int, c_int,
gid_t,
uid_t, uid_t,
getgid, getgid,
getuid getuid
@ -80,8 +81,8 @@ mod audit {
extern { extern {
fn getgrgid(gid: uid_t) -> *c_group; fn getgrgid(gid: uid_t) -> *c_group;
fn getgrouplist(name: *c_char, fn getgrouplist(name: *c_char,
basegid: c_int, basegid: gid_t,
groups: *c_int, groups: *gid_t,
ngroups: *mut c_int) -> c_int; ngroups: *mut c_int) -> c_int;
} }
@ -136,11 +137,11 @@ pub fn uumain(args: Vec<String>) -> int {
possible_pw.unwrap().pw_gid possible_pw.unwrap().pw_gid
} else { } else {
if rflag { if rflag {
unsafe { getgid() as i32 } unsafe { getgid() }
} else { } else {
unsafe { getegid() as i32 } unsafe { getegid() }
} }
} as u32; };
let gr = unsafe { getgrgid(id) }; let gr = unsafe { getgrgid(id) };
if nflag && gr.is_not_null() { if nflag && gr.is_not_null() {
@ -156,9 +157,9 @@ pub fn uumain(args: Vec<String>) -> int {
let id = if possible_pw.is_some() { let id = if possible_pw.is_some() {
possible_pw.unwrap().pw_uid possible_pw.unwrap().pw_uid
} else if rflag { } else if rflag {
unsafe { getgid() as i32 } unsafe { getgid() }
} else { } else {
unsafe { getegid() as i32 } unsafe { getegid() }
}; };
let pw = unsafe { getpwuid(id) }; let pw = unsafe { getpwuid(id) };
@ -168,7 +169,7 @@ pub fn uumain(args: Vec<String>) -> int {
}; };
println!("{:s}", pw_name); println!("{:s}", pw_name);
} else { } else {
println!("{:d}", id); println!("{:u}", id);
} }
return 0; return 0;
@ -208,7 +209,7 @@ fn pretty(possible_pw: Option<c_passwd>) {
} else { } else {
let login = unsafe { from_c_str(getlogin()) }; let login = unsafe { from_c_str(getlogin()) };
let rid = unsafe { getuid() }; let rid = unsafe { getuid() };
let pw = unsafe { getpwuid(rid as i32) }; let pw = unsafe { getpwuid(rid) };
let is_same_user = unsafe { let is_same_user = unsafe {
from_c_str(read(pw).pw_name) == login from_c_str(read(pw).pw_name) == login
@ -228,7 +229,7 @@ fn pretty(possible_pw: Option<c_passwd>) {
let eid = unsafe { getegid() }; let eid = unsafe { getegid() };
if eid == rid { if eid == rid {
let pw = unsafe { getpwuid(eid as i32) }; let pw = unsafe { getpwuid(eid) };
if pw.is_not_null() { if pw.is_not_null() {
println!( println!(
"euid\t{:s}", "euid\t{:s}",
@ -288,7 +289,7 @@ fn pline(possible_pw: Option<c_passwd>) {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn pline(possible_pw: Option<c_passwd>) { fn pline(possible_pw: Option<c_passwd>) {
let pw = if possible_pw.is_none() { let pw = if possible_pw.is_none() {
unsafe { read(getpwuid(getuid() as i32)) } unsafe { read(getpwuid(getuid())) }
} else { } else {
possible_pw.unwrap() possible_pw.unwrap()
}; };
@ -300,7 +301,7 @@ fn pline(possible_pw: Option<c_passwd>) {
let pw_shell = unsafe { from_c_str(pw.pw_shell) }; let pw_shell = unsafe { from_c_str(pw.pw_shell) };
println!( println!(
"{:s}:{:s}:{:d}:{:d}:{:s}:{:s}:{:s}", "{:s}:{:s}:{:u}:{:u}:{:s}:{:s}:{:s}",
pw_name, pw_name,
pw_passwd, pw_passwd,
pw.pw_uid, pw.pw_uid,
@ -343,8 +344,8 @@ fn id_print(possible_pw: Option<c_passwd>,
uid = possible_pw.unwrap().pw_uid; uid = possible_pw.unwrap().pw_uid;
gid = possible_pw.unwrap().pw_gid; gid = possible_pw.unwrap().pw_gid;
} else { } else {
uid = unsafe { getuid() as i32 }; uid = unsafe { getuid() };
gid = unsafe { getgid() as i32 }; gid = unsafe { getgid() };
} }
let mut ngroups; let mut ngroups;
@ -363,15 +364,15 @@ fn id_print(possible_pw: Option<c_passwd>,
if possible_pw.is_some() { if possible_pw.is_some() {
print!( print!(
"uid={:d}({:s})", "uid={:u}({:s})",
uid, uid,
unsafe { from_c_str(possible_pw.unwrap().pw_name) }); unsafe { from_c_str(possible_pw.unwrap().pw_name) });
} else { } else {
print!("uid={:u}", unsafe { getuid() }); print!("uid={:u}", unsafe { getuid() });
} }
print!(" gid={:d}", gid); print!(" gid={:u}", gid);
let gr = unsafe { getgrgid(gid as u32) }; let gr = unsafe { getgrgid(gid) };
if gr.is_not_null() { if gr.is_not_null() {
print!( print!(
"({:s})", "({:s})",
@ -379,9 +380,9 @@ fn id_print(possible_pw: Option<c_passwd>,
} }
let euid = unsafe { geteuid() }; let euid = unsafe { geteuid() };
if p_euid && (euid != uid as u32) { if p_euid && (euid != uid) {
print!(" euid={:u}", euid); print!(" euid={:u}", euid);
let pw = unsafe { getpwuid(euid as i32) }; let pw = unsafe { getpwuid(euid) };
if pw.is_not_null() { if pw.is_not_null() {
print!( print!(
"({:s})", "({:s})",
@ -408,7 +409,7 @@ fn id_print(possible_pw: Option<c_passwd>,
let mut first = true; let mut first = true;
for &gr in groups.iter() { for &gr in groups.iter() {
if !first { print!(",") } if !first { print!(",") }
print!("{:d}", gr); print!("{:u}", gr);
let group = unsafe { getgrgid(gr as u32) }; let group = unsafe { getgrgid(gr as u32) };
if group.is_not_null() { if group.is_not_null() {
let name = unsafe { let name = unsafe {