[commit: Cabal] master: Minor changes to the tar packing code (8f4133c)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8f4133c03f1dd976933319fe601daa13202ab39b

>---------------------------------------------------------------

commit 8f4133c03f1dd976933319fe601daa13202ab39b
Author: Duncan Coutts <duncan at haskell.org>
Date:   Wed Mar 19 00:09:19 2008 +0000

    Minor changes to the tar packing code
    Use lazy bytestring when packing tar entry headers rather than strict and
    then making a single chunk lazy bytestring later. The lazy bytestring pack
    will only generate a single chunk for a String that short (<4k).
    Use openBinaryFile rather than openFile + hSetBinaryMode.
    Add a haddock module header with copyright note.

>---------------------------------------------------------------

 cabal-install/Hackage/Tar.hs |   43 ++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/cabal-install/Hackage/Tar.hs b/cabal-install/Hackage/Tar.hs
index 6ccb359..6340f7f 100644
--- a/cabal-install/Hackage/Tar.hs
+++ b/cabal-install/Hackage/Tar.hs
@@ -1,11 +1,31 @@
--- | Simplistic TAR archive reading (Only gets the file names and file contents) and writing.
-module Hackage.Tar (TarHeader(..), TarFileType(..),
-                                         readTarArchive, extractTarArchive, 
-                                         extractTarGzFile, gunzip, gzip, createTarGzFile) where
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Hackage.Check
+-- Copyright   :  (c) 2007 Bjorn Bringert, 2008 Andrea Vezzosi
+-- License     :  BSD-like
+--
+-- Maintainer  :  duncan at haskell.org
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- Simplistic TAR archive reading and writing
+--
+-- Only handles the file names and file contents, ignores other file metadata.
+--
+-----------------------------------------------------------------------------
+module Hackage.Tar (
+  TarHeader(..),
+  TarFileType(..),
+  readTarArchive,
+  extractTarArchive,
+  extractTarGzFile,
+  gunzip,
+  gzip,
+  createTarGzFile
+  ) where
 
 import qualified Data.ByteString.Lazy as BS
 import qualified Data.ByteString.Lazy.Char8 as BS.Char8
-import qualified Data.ByteString.Char8 as B
 import Data.ByteString.Lazy (ByteString)
 import Data.Bits ((.&.),(.|.))
 import Data.Char (ord)
@@ -18,7 +38,7 @@ import System.Directory (Permissions(..), setPermissions, getPermissions, create
 import System.Time (ClockTime(..))
 import System.FilePath ((</>), isValid, isAbsolute, splitFileName, splitDirectories )
 import System.Posix.Types (FileMode)
-import System.IO (hFileSize,openFile,hClose,Handle,IOMode(ReadMode,WriteMode),withFile,hSetBinaryMode)
+import System.IO (hFileSize,openBinaryFile,hClose,Handle,IOMode(ReadMode,WriteMode),withFile,hSetBinaryMode)
 import System.IO.Unsafe (unsafeInterleaveIO)
 import Control.Monad (liftM,when)
 import Distribution.Simple.Utils (inDir,intercalate)
@@ -235,8 +255,7 @@ createTarEntry path =
                    tarLinkTarget = ""
                  }
        (sz,cnt,mh) <- case ftype of
-                TarNormalFile -> do h <- openFile path ReadMode
-                                    hSetBinaryMode h True
+                TarNormalFile -> do h <- openBinaryFile path ReadMode
                                     sz <- hFileSize h
                                     cnt <- BS.hGetContents h
                                     return (sz,cnt,Just h)
@@ -269,17 +288,17 @@ getModTime path =
 putTarEntry :: TarEntry -> ByteString
 putTarEntry TarEntry{entryHdr=hdr,entrySize=size,entryModTime=time,entryCnt=cnt} = 
   BS.concat
-    [BS.fromChunks [putTarHeader hdr size time]
+    [putTarHeader hdr size time
     ,cnt
     ,BS.replicate ((- fromIntegral size) `mod` 512) 0
     ]
 
 
-putTarHeader :: TarHeader -> Integer -> EpochTime -> B.ByteString
+putTarHeader :: TarHeader -> Integer -> EpochTime -> BS.ByteString
 putTarHeader hdr filesize modTime = 
     let block = concat $ (putHeaderNoChkSum hdr filesize modTime)
         chkSum = foldl' (\x y -> x + ord y) 0 block
-    in B.pack $ take 148 block ++
+    in BS.Char8.pack $ take 148 block ++
        putOct 8 chkSum ++
        drop 156 block
 
@@ -361,4 +380,4 @@ putChar8 :: Char -> String
 putChar8 c = [c]
 
 fill :: Int -> Char -> String
-fill n c = replicate n c
\ No newline at end of file
+fill n c = replicate n c