Merge pull request #75 from repi/seperator-fix

Fix file name sanitization for zips with OS incompatible path separators

src/types.rs

@@ -66,9 +66,20 @@ impl ZipFileData {
         let no_null_filename = match self.file_name.find('\0') {
             Some(index) => &self.file_name[0..index],
             None => &self.file_name,
-        };
+        }.to_string();
 
-        ::std::path::Path::new(no_null_filename)
+        // zip files can contain both / and \ as separators regardless of the OS
+        // and as we want to return a sanitized PathBuf that only supports the
+        // OS separator let's convert incompatible separators to compatible ones
+        let separator = ::std::path::MAIN_SEPARATOR;
+        let opposite_separator = match separator {
+            '/' => '\\',
+            '\\' | _ => '/',
+        };
+        let filename =
+            no_null_filename.replace(&opposite_separator.to_string(), &separator.to_string());
+
+        ::std::path::Path::new(&filename)
             .components()
             .filter(|component| match *component {
                 ::std::path::Component::Normal(..) => true,