Add position(::GZip.Stream,of_raw::Bool=false) that gives the current…

… position in the stream on *compressed* bytes instead of the normal uncompressed
JuliaIO · May 8, 2015 · 66f6e5b · 66f6e5b
1 parent dbd40e5
commit 66f6e5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/GZip.jl b/src/GZip.jl
@@ -201,7 +201,7 @@ gzread(s::GZipStream, p::Ptr, len::Integer) =
                   -1)
 
 let _zlib_h = Libdl.dlopen(_zlib)
-    global gzbuffer, _gzopen, _gzseek, _gztell, _gzrewind, _gzdirect
+    global gzbuffer, _gzopen, _gzseek, _gztell, _gzrewind, _gzdirect, _gzoffset
 
     # Doesn't exist in zlib 1.2.3 or earlier
     if Libdl.dlsym_e(_zlib_h, :gzbuffer) != C_NULL
@@ -219,12 +219,12 @@ let _zlib_h = Libdl.dlopen(_zlib)
         const _gzopen = :gzopen64
         const _gzseek = :gzseek64
         const _gztell = :gztell64
-        #_gzoffset = :gzoffset64  ## not implemented
+        const _gzoffset = :gzoffset64
     else
         const _gzopen = :gzopen
         const _gzseek = :gzseek
         const _gztell = :gztell
-        #_gzoffset = :gzoffset    ## not implemented
+        const _gzoffset = :gzoffset
     end
     const _gzrewind = :gzrewind
     const _gzdirect = :gzdirect
@@ -340,8 +340,9 @@ skip(s::GZipStream, n::Integer) =
            s.gz_file, n, SEEK_CUR)!=-1 ||
      error("skip (gzseek) failed")) # Mimick behavior of skip(s::IOStream, n)
 
-position(s::GZipStream) =
-    ccall((_gztell, _zlib), ZFileOffset, (Ptr{Void},), s.gz_file)
+position(s::GZipStream, of_raw::Bool=false) = of_raw ?
+    ccall((_gzoffset, _zlib), ZFileOffset, (Ptr{Void},), s.gz_file)
+      ccall((_gztell, _zlib), ZFileOffset, (Ptr{Void},), s.gz_file)
 
 eof(s::GZipStream) = @compat Bool(ccall((:gzeof, _zlib), Int32, (Ptr{Void},), s.gz_file))
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -85,10 +85,13 @@ write(gzfile, data) == length(data.data)
 @test flush(gzfile) == Z_OK
 
 pos = position(gzfile)
+pos2 = position(gzfile,true)
 @test_throws ErrorException seek(gzfile, 100)   # can't seek backwards on write
 @test position(gzfile) == pos
+@test position(gzfile,true) == pos2
 @test skip(gzfile, 100)
 @test position(gzfile) == pos + 100
+@test position(gzfile,true) == pos
 
 @test_throws MethodError truncate(gzfile, 100)
 @test_throws MethodError seekend(gzfile)