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

chore: Fix CI failure involving conversion to OsString for symlinks (see my comments on #125)

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

8
src/read.rs
View file

@ -689,14 +689,18 @@ impl<R: Read + Seek> ZipArchive<R> {
if file.is_symlink() && (cfg!(unix) || cfg!(windows)) {
let mut target = Vec::with_capacity(file.size() as usize);
file.read_exact(&mut target)?;
let target_path: PathBuf = directory.as_ref().join(OsString::try_from(target)?);
let target = OsString::from(target.to_string());
let target_path: PathBuf = directory.as_ref().join(target);
#[cfg(unix)]
{
std::os::unix::fs::symlink(target_path, outpath.as_path())?;
}
#[cfg(windows)]
{
if target_path.is_dir() {
// symlink_dir must be used if this points to another symlink that points to
// a directory.
if let Ok(meta) = std::fs::metadata(target_path)
&& meta.is_dir() {
std::os::windows::fs::symlink_dir(target_path, outpath.as_path())?;
} else {
std::os::windows::fs::symlink_file(target_path, outpath.as_path())?;

1
tests/repro_old423.rs
View file

@ -4,6 +4,7 @@ use tempdir::TempDir;
#[test]
fn repro_old423() -> zip::result::ZipResult<()> {
use std::io;
use tempdir::TempDir;
use zip::ZipArchive;
let mut v = Vec::new();