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

chcon: fix update to clap 4

Browse source
This commit is contained in:
Terts Diepraam 2022-10-13 20:42:18 +02:00
parent 9e1902eae3
commit 23fc898f79
2 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

0
out Normal file
View file

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

@ -66,15 +66,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let options = match parse_command_line(config, args) {
Ok(r) => r,
Err(r) => {
if let Error::CommandLine(r) = &r {
match r.kind() {
clap::error::ErrorKind::DisplayHelp
| clap::error::ErrorKind::DisplayVersion => {
println!("{}", r);
return Ok(());
}
_ => {}
}
if let Error::CommandLine(r) = r {
return Err(r.into());
}
return Err(UUsageError::new(libc::EXIT_FAILURE, format!("{}.\n", r)));
@ -163,6 +156,7 @@ pub fn uu_app() -> Command {
.about(ABOUT)
.override_usage(format_usage(USAGE))
.infer_long_args(true)
.disable_help_flag(true)
.arg(
Arg::new(options::HELP)
.long(options::HELP)
@ -370,10 +364,10 @@ fn parse_command_line(config: clap::Command, args: impl uucore::Args) -> Result<
CommandLineMode::ReferenceBased {
reference: PathBuf::from(path),
}
} else if matches.get_flag(options::USER)
|| matches.get_flag(options::ROLE)
|| matches.get_flag(options::TYPE)
|| matches.get_flag(options::RANGE)
} else if matches.contains_id(options::USER)
|| matches.contains_id(options::ROLE)
|| matches.contains_id(options::TYPE)
|| matches.contains_id(options::RANGE)
{
CommandLineMode::Custom {
user: matches.get_one::<OsString>(options::USER).map(Into::into),