Decode packets individually.

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/KeyRing/BuildKeyDB.hs b/lib/KeyRing/BuildKeyDB.hs
index bae2538..ad47ed0 100644
--- a/lib/KeyRing/BuildKeyDB.hs
+++ b/lib/KeyRing/BuildKeyDB.hs
@@ -40,6 +40,7 @@ import qualified Data.ByteString.Lazy       as L (ByteString, concat, empty,
                                                   fromChunks, hGetContents,
                                                   null, readFile, toChunks)
 import           Data.Char
+import           Data.Function
 import           Data.List
 import qualified Data.Map                   as Map
 import           Data.Maybe
@@ -302,13 +303,13 @@ readPacketsFromFile ctx fname = do
     -- warn $ fname ++ ": reading..."
     input <- readInputFileL ctx fname
 #if MIN_VERSION_binary(0,7,0)
-    return $
-      case decodeOrFail input of
-        Right (_,_,msg ) -> msg
+    return $ Message $ flip fix input $ \again some ->
+      case decodeOrFail some of
+        Right (more,_,msg ) -> msg : again more
         Left  (_,_,_)    ->
           -- FIXME
           -- trace (fname++": read fail") $
-          Message []
+          []
 #else
     return $ decode input
 #endif