Set eVersionMadeBy to 0 (FAT) in toEntry.

Since external attributes are set to 0 by default. Only set it to something else if we're actually reading the file and getting its external attributes. I suspect this will fix jgm/pandoc#2822.
jgm · Mar 28, 2016 · 8113bbf · 8113bbf
1 parent 857b077
commit 8113bbf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Codec/Archive/Zip.hs b/src/Codec/Archive/Zip.hs
@@ -241,7 +241,7 @@ toEntry path modtime contents =
             , eUncompressedSize        = fromIntegral uncompressedSize
             , eExtraField              = B.empty
             , eFileComment             = B.empty
-            , eVersionMadeBy           = versionMadeBy
+            , eVersionMadeBy           = 0  -- FAT
             , eInternalFileAttributes  = 0  -- potentially non-text
             , eExternalFileAttributes  = 0  -- appropriate if from stdin
             , eCompressedData          = finalData
@@ -276,7 +276,8 @@ readEntry opts path = do
 #else
         do fm <- fmap fileMode $ getFileStatus path'
            let modes = fromIntegral $ shiftL (toInteger fm) 16
-           return $ entry { eExternalFileAttributes = modes }
+           return $ entry { eExternalFileAttributes = modes,
+                            eVersionMadeBy = versionMadeBy }
 #endif
 
   when (OptVerbose `elem` opts) $ do

diff --git a/zip-archive.cabal b/zip-archive.cabal
@@ -1,5 +1,5 @@
 Name:                zip-archive
-Version:             0.3
+Version:             0.3.0.1
 Cabal-Version:       >= 1.10
 Build-type:          Custom
 Synopsis:            Library for creating and modifying zip archives.