Add unzip, remove bzip2 patch

Cargo.toml

@@ -31,6 +31,10 @@ path = "src/bin/gzip.rs"
 name = "info"
 path = "src/bin/info.rs"
 
+[[bin]]
+name = "keymap"
+path = "src/bin/keymap.rs"
+
 [[bin]]
 name = "less"
 path = "src/bin/less.rs"
@@ -64,12 +68,12 @@ name = "tar"
 path = "src/bin/tar.rs"
 
 [[bin]]
-name = "watch"
-path = "src/bin/watch.rs"
+name = "unzip"
+path = "src/bin/unzip.rs"
 
 [[bin]]
-name = "keymap"
-path = "src/bin/keymap.rs"
+name = "watch"
+path = "src/bin/watch.rs"
 
 [dependencies]
 extra = { git = "https://github.com/redox-os/libextra.git" }
@@ -82,7 +86,9 @@ filetime = "0.1.10"
 termion = "1.5.1"
 rust-lzma = "0.2"
 tree_magic = "0.2"
-bzip2 = { git = "https://github.com/ids1024/bzip2-rs", branch = "redox" }
+bzip2 = "0.3"
+zip = "0.3"
+
 
 [patch.crates-io]
 "filetime" = { git = "https://github.com/alexcrichton/filetime.git" }

src/bin/unzip.rs

+// From https://raw.githubusercontent.com/mvdnes/zip-rs/master/examples/extract.rs
+
+extern crate zip;
+
+use std::io;
+use std::fs;
+
+fn main() {
+    std::process::exit(real_main());
+}
+
+fn real_main() -> i32 {
+    let args: Vec<_> = std::env::args().collect();
+    if args.len() < 2 {
+        println!("Usage: {} <filename>", args[0]);
+        return 1;
+    }
+    let fname = std::path::Path::new(&*args[1]);
+    let file = fs::File::open(&fname).unwrap();
+
+    let mut archive = zip::ZipArchive::new(file).unwrap();
+
+    for i in 0..archive.len() {
+        let mut file = archive.by_index(i).unwrap();
+        let outpath = file.sanitized_name();
+
+        {
+            let comment = file.comment();
+            if !comment.is_empty() {
+                println!("File {} comment: {}", i, comment);
+            }
+        }
+
+        if (&*file.name()).ends_with('/') {
+            println!("File {} extracted to \"{}\"", i, outpath.as_path().display());
+            fs::create_dir_all(&outpath).unwrap();
+        } else {
+            println!("File {} extracted to \"{}\" ({} bytes)", i, outpath.as_path().display(), file.size());
+            if let Some(p) = outpath.parent() {
+                if !p.exists() {
+                    fs::create_dir_all(&p).unwrap();
+                }
+            }
+            let mut outfile = fs::File::create(&outpath).unwrap();
+            io::copy(&mut file, &mut outfile).unwrap();
+        }
+
+        // Get and Set permissions
+        #[cfg(any(unix, target_os="redox"))]
+        {
+            use std::os::unix::fs::PermissionsExt;
+
+            if let Some(mode) = file.unix_mode() {
+                fs::set_permissions(&outpath, fs::Permissions::from_mode(mode)).unwrap();
+            }
+        }
+    }
+    return 0;
+}