comments and type signatures

1 files changed, 7 insertions, 4 deletions

diff --git a/kiki.hs b/kiki.hs
index 325fc7f..eabfbf3 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1000,6 +1000,7 @@ parseCommonArgs margs = CommonArgsParsed { cap_homespec = homespec, cap_passfd =
         homespec = join . take 1 <$> Map.lookup "--homedir" margs
         passfd = fmap (FileDesc . read) passphrase_fd
 
+parseKeySpecs :: [String] -> [Maybe (String,String,String)]
 parseKeySpecs = map $ \specfile -> do
     let (spec,efilecmd) = break (=='=') specfile
     guard $ take 1 efilecmd=="="
@@ -1046,12 +1047,13 @@ sync bExport bImport bSecret cmdarg args_raw = do
     -- putStrLn $ "margs = " ++ show (Map.assocs margs)
     unkeysRef <- newIORef Map.empty
     pwRef <- newIORef Nothing
-    let keypairs0 = parseKeySpecs specs
+    let keypairs0 = parseKeySpecs specs -- [Maybe (usage,path,cmd)]
         specs     = fromMaybe [] $ Map.lookup "--pems" margs
         keyrings_ = fromMaybe [] $ Map.lookup "--keyrings" margs
         wallets   = fromMaybe [] $ Map.lookup "--wallets" margs
         passphrase_fd = concat <$> Map.lookup "--passphrase-fd" margs
 
+    -- Report first encountered error in Specs
     forM_ (take 1 $ filter (isNothing . fst)
                   $ zip keypairs0 specs      ) $ \(_,badspec) -> do
         warn $ "Syntax error in key pair specification " ++ show badspec
@@ -1064,8 +1066,9 @@ sync bExport bImport bSecret cmdarg args_raw = do
     let keypairs = catMaybes keypairs0
         homespec = join . take 1 <$> Map.lookup "--homedir" margs
         passfd = fmap (FileDesc . read) passphrase_fd
-        reftyp = if bExport then KF_Subkeys
-                            else KF_None
+        -- reftyp is used as value for 'fill field' in StreamInfo, walts and rings
+        reftyp = if bExport then KF_Subkeys -- export to rings when they have master present
+                            else KF_None    -- export nothing
         pems = flip map keypairs
                 $ \(usage,path,cmd) ->
                     let cmd' = mfilter (not . null) (Just cmd)
@@ -1092,7 +1095,7 @@ sync bExport bImport bSecret cmdarg args_raw = do
                     keyrings_
         hosts = maybe [] (map decorate) $ Map.lookup "--hosts" margs
                     where decorate fname = (ArgFile fname, buildStreamInfo reftyp Hosts)
-        pubfill = maybe KF_Subkeys id
+        pubfill = maybe KF_Subkeys id   -- Note: --import overrides --import-if-authentic
                         $ mplus import_f importifauth_f
             where
                 import_f       = fmap (const KF_All)