Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 01:38:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #485 from amty/master

Browse source 
NULL-pointer check in logname
This commit is contained in:
Heather 2015-01-08 08:53:32 +03:00
commit 0c89fcda25
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/logname/logname.rs
View file

@ -28,10 +28,15 @@ extern {
pub fn getlogin() -> *const libc::c_char;
}
unsafe fn get_userlogin() -> String {
let login: *const libc::c_char = getlogin();
String::from_raw_buf(login as *const u8)
fn get_userlogin() -> Option<String> {
unsafe {
let login: *const libc::c_char = getlogin();
if login.is_null() {
None
} else {
Some(String::from_raw_buf(login as *const u8))
}
}
}
static NAME: &'static str = "logname";
@ -77,8 +82,8 @@ pub fn uumain(args: Vec<String>) -> int {
}
fn exec() {
unsafe {
let userlogin = get_userlogin();
println!("{}", userlogin);
}
match get_userlogin() {
Some(userlogin) => println!("{}", userlogin),
None => println!("{}: no login name", NAME)
}
}