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

Merge pull request #2642 from 353fc443/uresult-whoami

Browse source 
whoami: Added UResult
This commit is contained in:
Michael Debertol 2021-09-07 16:44:52 +02:00 • committed by GitHub
commit d093c07887
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/uu/whoami/src/whoami.rs
View file

@ -14,9 +14,12 @@ extern crate clap;
#[macro_use]
extern crate uucore;
use uucore::error::{UResult, USimpleError};
mod platform;
pub fn uumain(args: impl uucore::Args) -> i32 {
#[uucore_procs::gen_uumain]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let app = uu_app();
if let Err(err) = app.get_matches_from_safe(args) {
@ -24,15 +27,12 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
|| err.kind == clap::ErrorKind::VersionDisplayed
{
println!("{}", err);
0
Ok(())
} else {
show_error!("{}", err);
1
return Err(USimpleError::new(1, format!("{}", err)));
}
} else {
exec();
0
exec()
}
}
@ -40,13 +40,19 @@ pub fn uu_app() -> App<'static, 'static> {
app_from_crate!()
}
pub fn exec() {
pub fn exec() -> UResult<()> {
unsafe {
match platform::get_username() {
Ok(username) => println!("{}", username),
Ok(username) => {
println!("{}", username);
Ok(())
}
Err(err) => match err.raw_os_error() {
Some(0) | None => crash!(1, "failed to get username"),
Some(_) => crash!(1, "failed to get username: {}", err),
Some(0) | None => Err(USimpleError::new(1, "failed to get username")),
Some(_) => Err(USimpleError::new(
1,
format!("failed to get username: {}", err),
)),
},
}
}