From 616b0bf9d80258b9b7f10d7777a6043a4b5be3be Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 29 Apr 2014 20:06:41 -0400 Subject: readPacketsFromFile takes InputFile instead of FilePath --- KeyRing.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'KeyRing.hs') diff --git a/KeyRing.hs b/KeyRing.hs index b9f198e..8c57d96 100644 --- a/KeyRing.hs +++ b/KeyRing.hs @@ -1007,7 +1007,7 @@ buildKeyDB doDecrypt ctx grip0 keyring = do n <- resolveInputFile ctx f return (n, access stream) - readp (n,acc) = fmap readp0 $ readPacketsFromFile n + readp (n,acc) = fmap readp0 $ readPacketsFromFile ctx (ArgFile n) where readp0 ps = ((n,acc'),ps) where acc' = case acc of @@ -1992,10 +1992,10 @@ readPacketsFromWallet wk fname = do (wk,MarkerPacket,(MarkerPacket,Map.empty)) :map prep ks -readPacketsFromFile :: FilePath -> IO Message -readPacketsFromFile fname = do +readPacketsFromFile :: InputFileContext -> InputFile -> IO Message +readPacketsFromFile ctx fname = do -- warn $ fname ++ ": reading..." - input <- L.readFile fname + input <- readInputFileL ctx fname #if MIN_VERSION_binary(0,7,0) return $ case decodeOrFail input of -- cgit v1.2.3