RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Remove redundant braces, show_error for getopt parse error

Browse source
This commit is contained in:
Vsevolod Velichko 2014-06-17 02:28:40 +04:00
parent 46c1a53d5a
commit fd6975c86c
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
chroot/chroot.rs
View file

@ -45,9 +45,9 @@ pub fn uumain(args: Vec<String>) -> int {
]; ];
let opts = match getopts(args.tail(), options) { let opts = match getopts(args.tail(), options) {
Ok(m) => {m} Ok(m) => m,
Err(f) => { Err(f) => {
println!("{}", f); show_error!("{}", f);
help_menu(program.as_slice(), options); help_menu(program.as_slice(), options);
return 1 return 1
} }
@ -79,7 +79,7 @@ pub fn uumain(args: Vec<String>) -> int {
}; };
vec!(shell, defaultOption) vec!(shell, defaultOption)
} }
_ => { opts.free.slice(1, opts.free.len()).iter().map(|x| x.as_slice()).collect() } _ => opts.free.slice(1, opts.free.len()).iter().map(|x| x.as_slice()).collect()
}; };
set_context(&newroot, &opts); set_context(&newroot, &opts);
@ -105,7 +105,7 @@ fn set_context(root: &Path, options: &getopts::Matches) {
}; };
s s
} }
None => { Vec::new() } None => Vec::new()
}; };
let user = if userspec.is_empty() { userStr.as_slice() } else { userspec.get(0).as_slice() }; let user = if userspec.is_empty() { userStr.as_slice() } else { userspec.get(0).as_slice() };
let group = if userspec.is_empty() { groupStr.as_slice() } else { userspec.get(1).as_slice() }; let group = if userspec.is_empty() { groupStr.as_slice() } else { userspec.get(1).as_slice() };
@ -133,7 +133,7 @@ fn enter_chroot(root: &Path) {
fn set_main_group(group: &str) { fn set_main_group(group: &str) {
if !group.is_empty() { if !group.is_empty() {
let group_id = match get_group(group) { let group_id = match get_group(group) {
None => { crash!(1, "no such group: {}", group) } None => crash!(1, "no such group: {}", group),
Some(g) => g.gr_gid Some(g) => g.gr_gid
}; };
let err = unsafe { setgid(group_id) }; let err = unsafe { setgid(group_id) };
@ -148,8 +148,8 @@ fn set_groups(groups: &str) {
let groupsVec: Vec<libc::gid_t> = FromIterator::from_iter( let groupsVec: Vec<libc::gid_t> = FromIterator::from_iter(
groups.split(',').map( groups.split(',').map(
|x| match get_group(x) { |x| match get_group(x) {
None => { crash!(1, "no such group: {}", x) } None => crash!(1, "no such group: {}", x),
Some(g) => { g.gr_gid } Some(g) => g.gr_gid
}) })
); );
let err = unsafe { let err = unsafe {