Read packet file with larger chunk size.

3 files changed, 29 insertions, 3 deletions

diff --git a/kiki.cabal b/kiki.cabal
index 293cc30..d790af7 100644
--- a/kiki.cabal
+++ b/kiki.cabal
@@ -94,7 +94,8 @@ library
                      Numeric.Interval.Bounded,
                      SuperOrd,
                      FunctorToMaybe,
-                     GnuPGAgent
+                     GnuPGAgent,
+                     ByteStringUtil
     other-modules:   TimeUtil,
                      ControlMaybe,
                      Compat,
diff --git a/lib/ByteStringUtil.hs b/lib/ByteStringUtil.hs
new file mode 100644
index 0000000..c6b509d
--- /dev/null
+++ b/lib/ByteStringUtil.hs
@@ -0,0 +1,23 @@
+module ByteStringUtil where
+
+import Data.ByteString.Lazy.Internal
+import Data.ByteString.Lazy
+import qualified Data.ByteString as S
+import System.IO
+import System.IO.Unsafe
+
+oneMeg :: Int
+oneMeg = 1048576
+
+hGetContentsN :: Int -> Handle -> IO ByteString
+hGetContentsN kk h = lazyRead
+  where
+    k = kk - chunkOverhead
+    lazyRead = unsafeInterleaveIO loop
+
+    loop = do
+        c <- S.hGetSome h k -- only blocks if there is no data available
+        if S.null c
+          then hClose h >> return Empty
+          else do cs <- lazyRead
+                  return (Chunk c cs)
diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index ad47ed0..ba5bafe 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -91,7 +91,7 @@ import           Foreign.Storable
 import           Data.IORef
 import           Data.Traversable           (sequenceA)
 import qualified Data.Traversable           as Traversable
-import           System.IO                  (stderr)
+import           System.IO                  (stderr,openFile,IOMode(ReadMode))
 
 import           System.Posix.IO            (fdToHandle)
 #if ! MIN_VERSION_base(4,6,0)
@@ -115,6 +115,7 @@ import           KeyRing.Types
 import           Transforms
 import           PacketTranscoder
 import           GnuPGAgent
+import           ByteStringUtil
 
 -- | buildKeyDB
 --
@@ -611,7 +612,8 @@ readInputFileL ctx (Pipe fd _)   = fdToHandle fd >>= L.hGetContents
 readInputFileL ctx (FileDesc fd) = fdToHandle fd >>= L.hGetContents
 readInputFileL ctx inp = do
     let fname = resolveInputFile ctx inp
-    fmap L.concat $ mapM L.readFile fname
+    hs <- mapM (`openFile` ReadMode) fname
+    fmap L.concat $ mapM (hGetContentsN oneMeg) hs
 
 getInputFileTime :: InputFileContext -> InputFile -> IO CTime
 getInputFileTime ctx (Pipe fdr fdw) = do