1 files changed, 26 insertions, 12 deletions

diff --git a/KeyRing.hs b/KeyRing.hs
index 5301c86..af7f3f4 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -36,7 +36,7 @@ import Data.Time.Clock.POSIX ( getPOSIXTime )
 import qualified Data.Map as Map
 import qualified Data.ByteString.Lazy as L ( unpack, pack, null, readFile, writeFile
         , ByteString, toChunks )
-import qualified Data.ByteString      as S ( ByteString, unpack, splitAt, concat, cons, spanEnd, hGetContents )
+import qualified Data.ByteString      as S ( ByteString, unpack, splitAt, concat, cons, spanEnd, hGetContents, readFile)
 import qualified Data.ByteString.Lazy.Char8 as Char8 ( span, unpack, break, concat, lines )
 import qualified Crypto.Types.PubKey.ECC as ECC
 import qualified Codec.Binary.Base32 as Base32
@@ -52,6 +52,7 @@ import System.IO (hPutStrLn,withFile,IOMode(..))
 import Data.Binary ( encode )
 import Data.IORef
 import System.Posix.IO (fdToHandle,fdRead)
+import qualified Data.Traversable as Traversable (mapM,forM,sequence)
 
 
 
@@ -95,6 +96,15 @@ data RefType = ConstRef | MutableRef (Maybe Initializer)
 isMutable (MutableRef {}) = True
 isMutable _               = False
 
+isring (KeyRingFile {}) = True
+isring _                = False
+
+pwfile (KeyRingFile f) = f
+pwfile _               = HomeSec
+
+iswallet (WalletFile {}) = True
+iswallet _               = False
+
 initializer (MutableRef x) = x
 initializer _              = Nothing
 
@@ -129,6 +139,7 @@ resolveInputFile secring pubring = resolve
     resolve (ArgFile f) = return f
     resolve _ = []
 
+
 filesToLock k secring pubring = do
     (f,(rtyp,ftyp)) <- Map.toList (kFiles k)
     case rtyp of
@@ -614,8 +625,9 @@ seek_key (KeyUidMatch pat) ps = if null bs
     uidStr _                = ""
 
 
-cachedContents :: Posix.Fd -> IO (IO S.ByteString)
-cachedContents fd = do
+
+cachedContents :: FilePath -> FilePath -> InputFile -> IO (IO S.ByteString)
+cachedContents secring pubring fd = do
     ref <- newIORef Nothing
     return $ get ref fd
  where
@@ -624,11 +636,14 @@ cachedContents fd = do
     get ref fd = do
         pw <- readIORef ref 
         flip (flip maybe return) pw $ do
-        do pwh <- fdToHandle fd -- (read fd)
-           pw <- fmap trimCR $ S.hGetContents pwh
-           writeIORef ref (Just pw)
-           return pw
+            pw <- fmap trimCR $ getContents fd
+            writeIORef ref (Just pw)
+            return pw
         
+    getContents (FileDesc fd) = fdToHandle fd >>= S.hGetContents
+    getContents inp = do
+        let fname = resolveInputFile secring pubring inp
+        fmap S.concat $ mapM S.readFile fname
 
 importPEMKey db' tup = do
             try db' $ \(db',report0) -> do
@@ -643,11 +658,7 @@ importPEMKey db' tup = do
 buildKeyDB :: FilePath -> FilePath -> Maybe String -> KeyRingData
               -> IO (KikiCondition ((KeyDB,Maybe String,Maybe Packet),[(FilePath,KikiReportAction)]))
 buildKeyDB secring pubring grip0 keyring = do
-    let isring (KeyRingFile {}) = True
-        isring _                = False
-
-        iswallet (WalletFile {}) = True
-        iswallet _               = False
+    let 
 
         files isring = do
             (f,(rtyp,ftyp)) <- Map.toList (kFiles keyring)
@@ -1137,6 +1148,9 @@ runKeyRing keyring = do
 
         let doDecrypt = todo
 
+        pws <-
+            Traversable.mapM (cachedContents secring pubring . pwfile . snd)
+                             (Map.filter (isring . snd) $ kFiles keyring)
 
         -- merge all keyrings, PEM files, and wallets
         bresult <- buildKeyDB secring pubring grip0 keyring