From 25d479e65d91cd6536b9bd3b3cd984a99b3eb9f9 Mon Sep 17 00:00:00 2001
From: Marli Frost <marli@frost.red>
Date: Tue, 25 Aug 2020 22:03:44 +0100
Subject: [PATCH] chore: remove dead code for 0.5.7

---
 src/read.rs      | 48 ------------------------------------------------
 tests/extract.rs | 22 ----------------------
 2 files changed, 70 deletions(-)
 delete mode 100644 tests/extract.rs

diff --git a/src/read.rs b/src/read.rs
index ab310132..0d47bd59 100644
--- a/src/read.rs
+++ b/src/read.rs
@@ -8,9 +8,7 @@ use crate::zipcrypto::ZipCryptoReader;
 use crate::zipcrypto::ZipCryptoReaderValid;
 use std::borrow::Cow;
 use std::collections::HashMap;
-use std::fs;
 use std::io::{self, prelude::*};
-use std::path::Path;
 
 use crate::cp437::FromCp437;
 use crate::types::{DateTime, System, ZipFileData};
@@ -313,52 +311,6 @@ impl<R: Read + io::Seek> ZipArchive<R> {
         })
     }
 
-    /// Extract a Zip archive into a directory.
-    ///
-    /// Paths are sanitized so that they cannot escape the given directory.
-    ///
-    /// This bails on the first error and does not attempt cleanup.
-    ///
-    /// # Platform-specific behaviour
-    ///
-    /// On unix systems permissions from the zip file are preserved, if they exist.
-    // FIXME: Implement path sanitization to allow this to be public API.
-    //        This probably means failing on paths that would escape the directory
-    #[allow(dead_code)]
-    fn extract<P: AsRef<Path>>(&mut self, directory: P) -> ZipResult<()> {
-        for i in 0..self.len() {
-            let mut file = self.by_index(i)?;
-            let filepath: std::path::PathBuf =
-                (|| unimplemented!("the sanitized path of {}", file.name()))();
-
-            let outpath = directory.as_ref().join(filepath);
-
-            if (file.name()).ends_with('/') {
-                fs::create_dir_all(&outpath)?;
-            } else {
-                if let Some(p) = outpath.parent() {
-                    if !p.exists() {
-                        fs::create_dir_all(&p)?;
-                    }
-                }
-                let mut outfile = fs::File::create(&outpath)?;
-                io::copy(&mut file, &mut outfile)?;
-            }
-
-            // Get and Set permissions
-            #[cfg(unix)]
-            {
-                use std::os::unix::fs::PermissionsExt;
-
-                if let Some(mode) = file.unix_mode() {
-                    fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?;
-                }
-            }
-        }
-
-        Ok(())
-    }
-
     /// Number of files contained in this zip.
     pub fn len(&self) -> usize {
         self.files.len()
diff --git a/tests/extract.rs b/tests/extract.rs
deleted file mode 100644
index 2f05e1df..00000000
--- a/tests/extract.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-extern crate zip;
-
-use std::fs;
-use std::io;
-
-use zip::ZipArchive;
-
-// This tests extracting the contents of a zip file
-#[test]
-#[ignore]
-fn extract() {
-    let mut v = Vec::new();
-    v.extend_from_slice(include_bytes!("../tests/data/files_and_dirs.zip"));
-    let mut _archive = ZipArchive::new(io::Cursor::new(v)).expect("couldn't open test zip file");
-
-    // archive
-    //     .extract("test_directory")
-    //     .expect("extract failed");
-
-    // Cleanup
-    fs::remove_dir_all("test_directory").expect("failed to remove extracted files");
-}