Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: soft links should remain the same #201

Merged
merged 8 commits into from
Jul 18, 2024
Merged

fix: soft links should remain the same #201

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
06a0b4e
misc: add test that validate the usecase
nichmor Jun 26, 2024
3c9b5db
misc: add test to run on unix
nichmor Jun 26, 2024
955ea39
fix: read entire target and dont transform symlink to absoulte
nichmor Jun 26, 2024
80b0025
test: Remove shell-script version of new test, and move Rust version …
Pr0methean Jul 5, 2024
81b6cf5
style: cargo fmt --all
Pr0methean Jul 5, 2024
270fcde
test: Require _deflate-any to run new test
Pr0methean Jul 6, 2024
a3232a2
Merge branch 'master' into fix/soft-links-should-remain-the-same
nichmor Jul 8, 2024
bde1bb9
Merge branch 'master' into fix/soft-links-should-remain-the-same
Pr0methean Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: read entire target and dont transform symlink to absoulte
  • Loading branch information
@nichmor
nichmor committed Jun 26, 2024
commit 955ea393eeaacaf7f0a7f26fb6b044231daf9fbe
5 changes: 2 additions & 3 deletions src/read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,7 @@ impl<R: Read + Seek> ZipArchive<R> {
}
let symlink_target = if file.is_symlink() && (cfg!(unix) || cfg!(windows)) {
let mut target = Vec::with_capacity(file.size() as usize);
file.read_exact(&mut target)?;
file.read_to_end(&mut target)?;
Some(target)
} else {
None
Expand All @@ -922,8 +922,7 @@ impl<R: Read + Seek> ZipArchive<R> {
{
use std::os::unix::ffi::OsStringExt;
let target = OsString::from_vec(target);
let target_path = directory.as_ref().join(target);
std::os::unix::fs::symlink(target_path, outpath.as_path())?;
std::os::unix::fs::symlink(&target, outpath.as_path())?;
}
#[cfg(windows)]
{
Expand Down