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

basename: rename variable names

Browse source 
Rename variable names to be more explicit ones
This commit is contained in:
bashi8128 2021-05-03 23:32:01 +09:00
parent 74802f9f0f
commit 5a4bb610ff
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/uu/basename/src/basename.rs
View file

@ -77,10 +77,10 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
); );
} }
let opt_s = matches.is_present(options::SUFFIX); let opt_suffix = matches.is_present(options::SUFFIX);
let opt_a = matches.is_present(options::MULTIPLE); let opt_multiple = matches.is_present(options::MULTIPLE);
let opt_z = matches.is_present(options::ZERO); let opt_zero = matches.is_present(options::ZERO);
let multiple_paths = opt_s || opt_a; let multiple_paths = opt_suffix || opt_multiple;
// too many arguments // too many arguments
if !multiple_paths && matches.occurrences_of(options::NAME) > 2 { if !multiple_paths && matches.occurrences_of(options::NAME) > 2 {
crash!( crash!(
@ -91,9 +91,9 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
); );
} }
let suffix = if opt_s { let suffix = if opt_suffix {
matches.value_of(options::SUFFIX).unwrap() matches.value_of(options::SUFFIX).unwrap()
} else if !opt_a && matches.occurrences_of(options::NAME) > 1 { } else if !opt_multiple && matches.occurrences_of(options::NAME) > 1 {
matches.values_of(options::NAME).unwrap().nth(1).unwrap() matches.values_of(options::NAME).unwrap().nth(1).unwrap()
} else { } else {
"" ""
@ -109,7 +109,7 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
matches.values_of(options::NAME).unwrap().take(1).collect() matches.values_of(options::NAME).unwrap().take(1).collect()
}; };
let line_ending = if opt_z { "\0" } else { "\n" }; let line_ending = if opt_zero { "\0" } else { "\n" };
for path in paths { for path in paths {
print!("{}{}", basename(&path, &suffix), line_ending); print!("{}{}", basename(&path, &suffix), line_ending);
} }