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

chore: Move path join into platform-independent code

Browse source
This commit is contained in:
Chris Hennick 2024-05-14 13:25:15 -07:00
parent 0ec043d6be
commit f275acf1d2
No known key found for this signature in database
GPG key ID: DA47AABA4961C509
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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; use std::ffi::{OsStr, 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,16 +689,13 @@ 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_path: PathBuf = directory.as_ref().join(OsString::try_from(target)?);
#[cfg(unix)] #[cfg(unix)]
{ {
use std::os::unix::ffi::OsStrExt;
let target_path: PathBuf =
directory.as_ref().join(OsStr::from_bytes(&target));
std::os::unix::fs::symlink(target_path, outpath.as_path())?; std::os::unix::fs::symlink(target_path, outpath.as_path())?;
} }
#[cfg(windows)] #[cfg(windows)]
{ {
let target_path: PathBuf = directory.as_ref().join(OsStr::from_vec(target));
if target_path.is_dir() { if target_path.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 {