Update examples to new IO

examples/extract.rs

@@ -1,4 +1,4 @@
-#![feature(old_path, io, fs, env)]
+#![feature(path, io, fs, exit_status)]
 
 extern crate zip;
 
@@ -13,7 +13,7 @@ fn main()
         std::env::set_exit_status(1);
         return;
     }
-    let fname = Path::new(&*args[1]);
+    let fname = std::path::Path::new(&*args[1]);
     let file = fs::File::open(&fname).unwrap();
 
     let mut archive = zip::ZipArchive::new(file).unwrap();
@@ -29,40 +29,40 @@ fn main()
             if comment.len() > 0 { println!("  File comment: {}", comment); }
         }
 
-        fs::create_dir_all(&outpath.dir_path()).unwrap();
+        fs::create_dir_all(outpath.parent().unwrap_or(std::path::Path::new(""))).unwrap();
 
         if (&*file.name()).ends_with("/") {
-            create_directory(outpath);
+            create_directory(&outpath);
         }
         else {
-            write_file(&mut file, outpath);
+            write_file(&mut file, &outpath);
         }
     }
 }
 
-fn write_file(reader: &mut zip::read::ZipFile, outpath: Path)
+fn write_file(reader: &mut zip::read::ZipFile, outpath: &std::path::Path)
 {
     let mut outfile = fs::File::create(&outpath).unwrap();
     io::copy(reader, &mut outfile).unwrap();
 }
 
-fn create_directory(outpath: Path)
+fn create_directory(outpath: &std::path::Path)
 {
     fs::create_dir_all(&outpath).unwrap();
 }
 
-fn sanitize_filename(filename: &str) -> Path
+fn sanitize_filename(filename: &str) -> std::path::PathBuf
 {
     let no_null_filename = match filename.find('\0') {
         Some(index) => &filename[0..index],
         None => filename,
     };
 
-    Path::new(no_null_filename)
+    std::path::Path::new(no_null_filename)
         .components()
-        .skip_while(|component| *component == b"..")
-        .fold(Path::new(""), |mut p, cur| {
-            p.push(cur);
-            p
+        .filter(|component| *component != std::path::Component::ParentDir)
+        .fold(std::path::PathBuf::new(""), |mut path, ref cur| {
+            path.push(cur.as_os_str());
+            path
         })
 }

examples/extract_lorem.rs

@@ -1,4 +1,4 @@
-#![feature(old_path, io, fs, env)]
+#![feature(path, io, fs, exit_status)]
 
 use std::io::prelude::*;
 
@@ -12,7 +12,7 @@ fn main()
         std::env::set_exit_status(1);
         return;
     }
-    let fname = Path::new(&*args[1]);
+    let fname = std::path::Path::new(&*args[1]);
     let zipfile = std::fs::File::open(&fname).unwrap();
 
     let mut archive = zip::ZipArchive::new(zipfile).unwrap();

examples/write_sample.rs

@@ -1,4 +1,4 @@
-#![feature(io, fs, old_path, env)]
+#![feature(io, fs, path, exit_status)]
 
 use std::io::prelude::*;
 
@@ -23,7 +23,7 @@ fn main()
 
 fn doit(filename: &str) -> zip::result::ZipResult<()>
 {
-    let path = Path::new(filename);
+    let path = std::path::Path::new(filename);
     let file = std::fs::File::create(&path).unwrap();
 
     let mut zip = zip::ZipWriter::new(file);