DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Fix continued issues, and factor out the Vec<u8>-to-OsString conversion (cc: #125)

Browse source
This commit is contained in:
Chris Hennick 2024-05-15 15:08:16 -07:00
parent c52ec50306
commit 8435561093
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/read.rs
View file

@ -13,7 +13,7 @@ use crate::types::{AesMode, AesVendorVersion, DateTime, System, ZipFileData};
use crate::zipcrypto::{ZipCryptoReader, ZipCryptoReaderValid, ZipCryptoValidator}; use crate::zipcrypto::{ZipCryptoReader, ZipCryptoReaderValid, ZipCryptoValidator};
use indexmap::IndexMap; use indexmap::IndexMap;
use std::borrow::Cow; use std::borrow::Cow;
use std::ffi::{OsStr, OsString}; use std::ffi::OsString;
use std::fs::create_dir_all; use std::fs::create_dir_all;
use std::io::{self, copy, prelude::*, sink}; use std::io::{self, copy, prelude::*, sink};
use std::ops::Deref; use std::ops::Deref;
@ -689,18 +689,24 @@ impl<R: Read + Seek> ZipArchive<R> {
if file.is_symlink() && (cfg!(unix) || cfg!(windows)) { if file.is_symlink() && (cfg!(unix) || cfg!(windows)) {
let mut target = Vec::with_capacity(file.size() as usize); let mut target = Vec::with_capacity(file.size() as usize);
file.read_exact(&mut target)?; file.read_exact(&mut target)?;
let target = OsString::from(target.to_string()); let target = try_utf8_to_os_string(target)?;
let target_path: PathBuf = directory.as_ref().join(target); let target_path: PathBuf = directory.as_ref().join(target.clone());
#[cfg(unix)] #[cfg(unix)]
{ {
std::os::unix::fs::symlink(target_path, outpath.as_path())?; std::os::unix::fs::symlink(target_path, outpath.as_path())?;
} }
#[cfg(windows)] #[cfg(windows)]
{ {
// symlink_dir must be used if this points to another symlink that points to let target_is_dir = if let Ok(meta) = std::fs::metadata(target_path) {
// a directory. meta.is_dir()
if let Ok(meta) = std::fs::metadata(target_path) } else if let Some(target_in_archive) =
&& meta.is_dir() { self.index_for_path(path_to_string(target))
{
self.by_index_raw(target_in_archive)?.is_dir()
} else {
false
};
if target_is_dir {
std::os::windows::fs::symlink_dir(target_path, outpath.as_path())?; std::os::windows::fs::symlink_dir(target_path, outpath.as_path())?;
} else { } else {
std::os::windows::fs::symlink_file(target_path, outpath.as_path())?; std::os::windows::fs::symlink_file(target_path, outpath.as_path())?;
@ -918,6 +924,17 @@ impl<R: Read + Seek> ZipArchive<R> {
} }
} }
#[cfg(unix)]
fn try_utf8_to_os_string(utf8_bytes: Vec<u8>) -> std::io::Result<OsString> {
use std::os::unix::ffi::OsStringExt;
Ok(OsString::from_vec(utf8_bytes))
}
#[cfg(windows)]
fn to_os_string(utf8_bytes: Vec<u8>) -> std::io::Result<OsString> {
Ok(OsString::from(String::from_utf8(target)?))
}
const fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T> { const fn unsupported_zip_error<T>(detail: &'static str) -> ZipResult<T> {
Err(ZipError::UnsupportedArchive(detail)) Err(ZipError::UnsupportedArchive(detail))
} }