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

Code style fixes

Browse source
This commit is contained in:
Vsevolod Velichko 2014-06-17 02:03:23 +04:00
parent eebcdbddb1
commit c7e0e5aa5e
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
chroot/chroot.rs
View file

@ -24,8 +24,8 @@ extern {
fn setgroups(size: libc::c_int, list: *libc::uid_t) -> libc::c_int; fn setgroups(size: libc::c_int, list: *libc::uid_t) -> libc::c_int;
} }
static NAME : &'static str = "chroot"; static NAME: &'static str = "chroot";
static VERSION : &'static str = "1.0.0"; static VERSION: &'static str = "1.0.0";
#[allow(dead_code)] #[allow(dead_code)]
fn main () { std::os::set_exit_status(uumain(std::os::args())); } fn main () { std::os::set_exit_status(uumain(std::os::args())); }
@ -62,8 +62,8 @@ pub fn uumain(args: Vec<String>) -> int {
return 1 return 1
} }
let defaultShell : &'static str = "/bin/sh"; let defaultShell: &'static str = "/bin/sh";
let defaultOption : &'static str = "-i"; let defaultOption: &'static str = "-i";
let userShell = std::os::getenv("SHELL"); let userShell = std::os::getenv("SHELL");
let newroot = Path::new(opts.free.get(0).as_slice()); let newroot = Path::new(opts.free.get(0).as_slice());
@ -71,9 +71,9 @@ pub fn uumain(args: Vec<String>) -> int {
crash!(1, "cannot change root directory to `{}`: no such directory", newroot.display()); crash!(1, "cannot change root directory to `{}`: no such directory", newroot.display());
} }
let command : Vec<&str> = match opts.free.len() { let command: Vec<&str> = match opts.free.len() {
1 => { 1 => {
let shell : &str = match userShell { let shell: &str = match userShell {
None => {defaultShell} None => {defaultShell}
Some(ref s) => {s.as_slice()} Some(ref s) => {s.as_slice()}
}; };
@ -86,7 +86,7 @@ pub fn uumain(args: Vec<String>) -> int {
unsafe { unsafe {
let executable = command.get(0).as_slice().to_c_str().unwrap(); let executable = command.get(0).as_slice().to_c_str().unwrap();
let mut commandParts : Vec<*i8> = command.iter().map(|x| x.to_c_str().unwrap()).collect(); let mut commandParts: Vec<*i8> = command.iter().map(|x| x.to_c_str().unwrap()).collect();
commandParts.push(std::ptr::null()); commandParts.push(std::ptr::null());
execvp(executable as *libc::c_char, commandParts.as_ptr() as **libc::c_char) as int execvp(executable as *libc::c_char, commandParts.as_ptr() as **libc::c_char) as int
} }
@ -99,7 +99,7 @@ fn set_context(root: &Path, options: &getopts::Matches) {
let groupsStr = options.opt_str("groups").unwrap_or_default(); let groupsStr = options.opt_str("groups").unwrap_or_default();
let userspec = match userspecStr { let userspec = match userspecStr {
Some(ref u) => { Some(ref u) => {
let s : Vec<&str> = u.as_slice().split(':').collect(); let s: Vec<&str> = u.as_slice().split(':').collect();
if s.len() != 2 { if s.len() != 2 {
crash!(1, "invalid userspec: `{:s}`", u.as_slice()) crash!(1, "invalid userspec: `{:s}`", u.as_slice())
}; };
@ -145,7 +145,7 @@ fn set_main_group(group: &str) {
fn set_groups(groups: &str) { fn set_groups(groups: &str) {
if !groups.is_empty() { if !groups.is_empty() {
let groupsVec : Vec<libc::uid_t> = FromIterator::from_iter( let groupsVec: Vec<libc::uid_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) }