vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Simplify contain program, update kernel

Browse source
This commit is contained in:
Jeremy Soller 2017-01-10 10:00:07 -07:00
parent 4bff540aad
commit 80bf9568f6
2 changed files with 6 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel

@ -1 +1 @@
Subproject commit ba4588e84fdb8260867a346dd7a92ae2e9454e77 Subproject commit ed69fac232744d1aff4fb02ba6be196c74e9d2f0

60
programs/contain/src/main.rs
View file

@ -13,48 +13,10 @@ use self::chroot::ChrootScheme;
mod chroot; mod chroot;
fn usage() -> ! { fn usage() -> ! {
write!(stderr(), "contain [create|enter] root cmd args..\n").unwrap(); write!(stderr(), "contain root cmd args..\n").unwrap();
process::exit(1); process::exit(1);
} }
fn create(root: &Path) {
let root = Path::new(root);
println!("{}", root.display());
fs::create_dir(root).unwrap();
let mut bin = root.to_path_buf();
bin.push("bin");
println!("{}", bin.display());
fs::create_dir(&bin).unwrap();
for entry in fs::read_dir("/bin").unwrap() {
let entry = entry.unwrap();
let mut dest = bin.clone();
dest.push(entry.file_name());
println!("{} -> {}", entry.path().display(), dest.display());
fs::copy(entry.path(), dest).unwrap();
}
let mut etc = root.to_path_buf();
etc.push("etc");
println!("{}", etc.display());
fs::create_dir(&etc).unwrap();
let mut net = etc.clone();
net.push("net");
println!("{}", net.display());
fs::create_dir(&net).unwrap();
for entry in fs::read_dir("/etc/net").unwrap() {
let entry = entry.unwrap();
let mut dest = net.clone();
dest.push(entry.file_name());
println!("{} -> {}", entry.path().display(), dest.display());
fs::copy(entry.path(), dest).unwrap();
}
}
fn enter(root: &Path, cmd: &str, args: &[String]) { fn enter(root: &Path, cmd: &str, args: &[String]) {
let names = [ let names = [
"rand", "rand",
@ -124,22 +86,10 @@ fn enter(root: &Path, cmd: &str, args: &[String]) {
pub fn main() { pub fn main() {
let mut args = env::args().skip(1); let mut args = env::args().skip(1);
if let Some(op) = args.next() { if let Some(root) = args.next() {
match op.as_str() { let cmd = args.next().unwrap_or(env::var("SHELL").unwrap_or("sh".to_string()));
"create" => if let Some(root) = args.next() { let args: Vec<String> = args.collect();
create(Path::new(&root)); enter(Path::new(&root), &cmd, &args);
} else {
usage();
},
"enter" => if let Some(root) = args.next() {
let cmd = args.next().unwrap_or(env::var("SHELL").unwrap_or("sh".to_string()));
let args: Vec<String> = args.collect();
enter(Path::new(&root), &cmd, &args);
} else {
usage();
},
_ => usage()
}
} else { } else {
usage(); usage();
} }