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 #2847 from jfinkels/pr-uresult

Browse source 
pr: return UResult from uumain() function
This commit is contained in:
Sylvestre Ledru 2022-01-07 21:51:41 +01:00 • committed by GitHub
commit 5f778ffa2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/uu/pr/src/pr.rs
View file

@ -25,6 +25,7 @@ use std::io::{stdin, stdout, BufRead, BufReader, Lines, Read, Write};
use std::os::unix::fs::FileTypeExt; use std::os::unix::fs::FileTypeExt;
use uucore::display::Quotable; use uucore::display::Quotable;
use uucore::error::UResult;
type IOError = std::io::Error; type IOError = std::io::Error;
@ -174,7 +175,8 @@ pub fn uu_app() -> clap::App<'static, 'static> {
clap::App::new(uucore::util_name()) clap::App::new(uucore::util_name())
} }
pub fn uumain(args: impl uucore::Args) -> i32 { #[uucore_procs::gen_uumain]
pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let args = args let args = args
.collect_str(uucore::InvalidEncodingHandling::Ignore) .collect_str(uucore::InvalidEncodingHandling::Ignore)
.accept_any(); .accept_any();
@ -388,7 +390,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
if matches.opt_present("version") { if matches.opt_present("version") {
println!("{} {}", NAME, VERSION); println!("{} {}", NAME, VERSION);
return 0; return Ok(());
} }
let mut files = matches.free.clone(); let mut files = matches.free.clone();
@ -412,7 +414,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
Ok(options) => options, Ok(options) => options,
Err(err) => { Err(err) => {
print_error(&matches, err); print_error(&matches, err);
return 1; return Err(1.into());
} }
}; };
@ -430,11 +432,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
_ => 0, _ => 0,
}; };
if status != 0 { if status != 0 {
return status; return Err(status.into());
} }
} }
Ok(())
0
} }
/// Returns re-written arguments which are passed to the program. /// Returns re-written arguments which are passed to the program.
@ -470,7 +471,7 @@ fn print_error(matches: &Matches, err: PrError) {
} }
} }
fn print_usage(opts: &mut getopts::Options, matches: &Matches) -> i32 { fn print_usage(opts: &mut getopts::Options, matches: &Matches) -> UResult<()> {
println!("{} {} -- print files", NAME, VERSION); println!("{} {} -- print files", NAME, VERSION);
println!(); println!();
println!( println!(
@ -508,10 +509,9 @@ fn print_usage(opts: &mut getopts::Options, matches: &Matches) -> i32 {
options::COLUMN_OPTION options::COLUMN_OPTION
); );
if matches.free.is_empty() { if matches.free.is_empty() {
return 1; return Err(1.into());
} }
Ok(())
0
} }
fn parse_usize(matches: &Matches, opt: &str) -> Option<Result<usize, PrError>> { fn parse_usize(matches: &Matches, opt: &str) -> Option<Result<usize, PrError>> {