RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-05 15:37:47 +00:00
Code Issues Activity

coreopts: display package name instead of module path

Browse source
This commit is contained in:
Knight 2016-08-10 00:16:06 +08:00 • committed by Roy Ivy III
parent bcec54f572
commit 789141d926
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/uucore/coreopts.rs
View file

@ -3,13 +3,15 @@ use std::io::Write;
pub struct CoreOptions { pub struct CoreOptions {
pub options : getopts::Options, pub options : getopts::Options,
pkgname: &'static str,
longhelp : Option<String> longhelp : Option<String>
} }
impl<'a> CoreOptions { impl<'a> CoreOptions {
pub fn new() -> Self { pub fn new(name: &'static str) -> Self {
let mut ret = CoreOptions { let mut ret = CoreOptions {
options : getopts::Options::new(), options : getopts::Options::new(),
pkgname: name,
longhelp: None longhelp: None
}; };
ret.options ret.options
@ -36,16 +38,18 @@ impl<'a> CoreOptions {
let matches = match self.options.parse(&args[1..]) { let matches = match self.options.parse(&args[1..]) {
Ok(m) => { Some(m) }, Ok(m) => { Some(m) },
Err(f) => { Err(f) => {
crash!(1, "{}", msg_invalid_input!(format!("{}", f))); eprintln!("{}: {}", self.pkgname, f);
eprintln!("Try '{} --help' for more information.", self.pkgname);
exit!(1)
} }
}.unwrap(); }.unwrap();
if matches.opt_present("help") { if matches.opt_present("help") {
exit!(match self.longhelp { exit!(match self.longhelp {
Some(ref lhelp) => { print!("{}", lhelp); 0} Some(ref lhelp) => { println!("{}", lhelp); 0}
None => 1 None => 1
}); });
} else if matches.opt_present("version") { } else if matches.opt_present("version") {
print!("{}", msg_version!()); println!("{} {}", self.pkgname, env!("CARGO_PKG_VERSION"));
exit!(0); exit!(0);
} }
matches matches