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

Jump to bottom

Bandaid for gzseek bug on Windows #25

Merged
merged 1 commit into from
Apr 10, 2015
Merged

Bandaid for gzseek bug on Windows #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/GZip.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ gzread(s::GZipStream, p::Ptr, len::Integer) =
-1)

let _zlib_h = Libdl.dlopen(_zlib)
global gzbuffer, _gzopen, _gzseek, _gztell
global gzbuffer, _gzopen, _gzseek, _gztell, _gzrewind, _gzdirect

# Doesn't exist in zlib 1.2.3 or earlier
if Libdl.dlsym_e(_zlib_h, :gzbuffer) != C_NULL
Expand All @@ -226,6 +226,8 @@ let _zlib_h = Libdl.dlopen(_zlib)
const _gztell = :gztell
#_gzoffset = :gzoffset ## not implemented
end
const _gzrewind = :gzrewind
const _gzdirect = :gzdirect
end

function gzopen(fname::String, gzmode::String, gz_buf_size::Integer)
Expand Down Expand Up @@ -321,10 +323,16 @@ flush(s::GZipStream) = flush(s, Z_SYNC_FLUSH)
truncate(s::GZipStream, n::Integer) = throw(MethodError(truncate, (GZipStream, Integer)))

# Note: seeks to byte position within uncompressed data stream
seek(s::GZipStream, n::Integer) =
(ccall((_gzseek, _zlib), ZFileOffset, (Ptr{Void}, ZFileOffset, Int32),
function seek(s::GZipStream, n::Integer)
# Note: band-aid to avoid a bug occurring on uncompressed files under Windows
@windows_only if (ccall((_gzdirect, _zlib), Cint, (Ptr{Void},), s.gz_file)) == 1
ccall((_gzrewind, _zlib), Cint, (Ptr{Void},), s.gz_file)!=-1 ||
error("seek (gzseek) failed")
end
ccall((_gzseek, _zlib), ZFileOffset, (Ptr{Void}, ZFileOffset, Int32),
s.gz_file, n, SEEK_SET)!=-1 || # Mimick behavior of seek(s::IOStream, n)
error("seek (gzseek) failed"))
error("seek (gzseek) failed")
end

# Note: skips bytes within uncompressed data stream
skip(s::GZipStream, n::Integer) =
Expand Down