Skip to content

Ability to mimic a zip file created by a Linux file-system. #325

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

Merged
piksel merged 4 commits into from
Jun 15, 2019
Merged

Ability to mimic a zip file created by a Linux file-system. #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b575a96
respect the VersionMadeBy property of ZipEntry
bjorg Feb 18, 2019
0482654
makde all constructor public so that VersionMadeBy can be set at crea…
bjorg Feb 18, 2019
646b91a
Merge branch 'master' into LinuxZipFix
bjorg May 22, 2019
a6766fb
simplified the HostSystem fix
bjorg May 22, 2019
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
2 changes: 1 addition & 1 deletion src/ICSharpCode.SharpZipLib/Zip/ZipEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ public int HostSystem

set
{
versionMadeBy &= 0xff;
versionMadeBy &= 0x00ff;
versionMadeBy |= (ushort)((value & 0xff) << 8);
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/ICSharpCode.SharpZipLib/Zip/ZipFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ public ZipFile(string name)
public ZipFile(FileStream file) :
this(file, false)
{

}

/// <summary>
Expand Down Expand Up @@ -489,7 +489,7 @@ public ZipFile(FileStream file, bool leaveOpen)
public ZipFile(Stream stream) :
this(stream, false)
{

}

/// <summary>
Expand Down Expand Up @@ -2157,7 +2157,7 @@ private int WriteCentralDirectoryHeader(ZipEntry entry)
WriteLEInt(ZipConstants.CentralHeaderSignature);

// Version made by
WriteLEShort(ZipConstants.VersionMadeBy);
WriteLEShort((entry.HostSystem << 8) | entry.VersionMadeBy);

// Version required to extract
WriteLEShort(entry.Version);
Expand Down
2 changes: 1 addition & 1 deletion src/ICSharpCode.SharpZipLib/Zip/ZipOutputStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@ public override void Finish()
foreach (ZipEntry entry in entries)
{
WriteLeInt(ZipConstants.CentralHeaderSignature);
WriteLeShort(ZipConstants.VersionMadeBy);
WriteLeShort((entry.HostSystem << 8) | entry.VersionMadeBy);
WriteLeShort(entry.Version);
WriteLeShort(entry.Flags);
WriteLeShort((short)entry.CompressionMethodForHeader);
Expand Down