some minor cleanup

1 files changed, 33 insertions, 34 deletions

diff --git a/kiki.hs b/kiki.hs
index 32b86bd..dc1344e 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -49,7 +49,7 @@ import qualified Data.Map as Map
 import DotLock
 -- import Codec.Crypto.ECC.Base -- hecc package
 -- import Text.Printf
-import qualified CryptoCoins as CryptoCoins
+import qualified CryptoCoins 
 import LengthPrefixedBE
 import Data.Binary.Put (putWord32be,runPut,putByteString)
 import Data.Binary.Get (runGet)
@@ -57,6 +57,9 @@ import Data.Binary.Get (runGet)
 import KeyRing
 import Base58
 
+-- {-# ANN module ("HLint: ignore Eta reduce"::String) #-}
+-- {-# ANN module ("HLint: ignore Use camelCase"::String) #-}
+
 -- instance Default S.ByteString where def = S.empty
 
 warn str = hPutStrLn stderr str
@@ -220,8 +223,7 @@ listKeysFiltered grips pkts = do
     let (certs,bs) = getBindings pkts
         as = accBindings bs
         defaultkind (k:_) hs = k
-        defaultkind []    hs = maybe "subkey"
-                                     id
+        defaultkind []    hs = fromMaybe "subkey"
                                      ( listToMaybe
                                      . mapMaybe (fmap usageString . keyflags)
                                      $ hs)
@@ -245,7 +247,7 @@ listKeysFiltered grips pkts = do
                         2 -> " <-- "
                         3 -> " <-> "
                 formkind = take kindcol $ defaultkind kind hashed ++ repeat ' '
-                -- torhash = maybe "" id $ derToBase32 <$> derRSA sub
+                -- torhash = fromMaybe "" $ derToBase32 <$> derRSA sub
                 (netid,kind') = maybe (0x0,"bitcoin")
                                       (\n->(CryptoCoins.publicByteFromName n,n))
                                       $ listToMaybe kind
@@ -269,7 +271,7 @@ listKeysFiltered grips pkts = do
             guard ("tor" `elem` kind)
             guard (code .&. 0x2 /= 0)
             maybeToList $ derToBase32 <$> derRSA sub
-        uid = {- maybe "" id . listToMaybe $ -} do
+        uid = {- fromMaybe "" . listToMaybe $ -} do
             (keys,sigs) <- certs
             sig <- sigs
             guard (isCertificationSig sig)
@@ -293,11 +295,10 @@ listKeysFiltered grips pkts = do
                         let subdom0 = L.fromChunks [encodeUtf8 (uid_subdomain parsed)]
                             len = L.length subdom0
                             subdom = Char8.unpack subdom0
-                            match = ( (==subdom) . take (fromIntegral len))
+                            match = (==subdom) . take (fromIntegral len)
                         guard (len >= 16)
                         listToMaybe $ filter match torkeys
-            unlines $ [ " " ++ ar ++ "@" ++ " " ++ uid_full parsed ]
-                    ++ showsigs secondary
+            unlines $  (" " ++ ar ++ "@" ++ " " ++ uid_full parsed) : showsigs secondary
         -- (_,sigs) = unzip certs
     "master-key " ++ fingerprint top ++ "\n" ++ uid ++"  ...\n" ++ subkeys ++ "\n"
 
@@ -320,7 +321,7 @@ modifyUID other              = other
 
 
 readPublicKey :: Char8.ByteString -> RSAPublicKey
-readPublicKey bs = maybe er id $ do
+readPublicKey bs = fromMaybe er $ do
     let (pre,bs1) = Char8.splitAt 7 bs
     guard $ pre == "ssh-rsa"
     let (sp,bs2) = Char8.span isSpace bs1
@@ -367,7 +368,7 @@ show_all db = do
     let Message packets = flattenKeys True db
     putStrLn $ listKeys packets
 
-show_whose_key input_key db = do
+show_whose_key input_key db = 
     flip (maybe $ return ()) input_key $ \input_key -> do
     let ks = whoseKey input_key db
     case ks of
@@ -379,7 +380,7 @@ show_whose_key input_key db = do
 
 show_pem keyspec wkgrip db = do
     let s = parseSpec wkgrip keyspec
-    flip (maybe $ warn (keyspec ++ ": not found") >> return ())
+    flip (maybe . void $ warn (keyspec ++ ": not found"))
          (selectPublicKey s db)
          $ \k -> do
     let rsa = pkcs8 . fromJust $ rsaKeyFromPacket k
@@ -390,7 +391,7 @@ show_pem keyspec wkgrip db = do
 
 show_ssh keyspec wkgrip db = do
     let s = parseSpec wkgrip keyspec
-    flip (maybe $ warn (keyspec ++ ": not found") >> return ())
+    flip (maybe . void $ warn (keyspec ++ ": not found")) 
          (selectPublicKey s db)
          $ \k -> do
     let Just (RSAKey (MPI n) (MPI e)) = rsaKeyFromPacket k
@@ -409,7 +410,7 @@ show_key keyspec wkgrip db = do
 
 show_wip keyspec wkgrip db = do
     let s = parseSpec wkgrip keyspec
-    flip (maybe $ warn (keyspec ++ ": not found") >> return ())
+    flip (maybe $ void (warn (keyspec ++ ": not found")))
          (selectSecretKey s db)
          $ \k -> do
     let nwb = maybe 0x80 CryptoCoins.secretByteFromName $ snd s
@@ -495,7 +496,7 @@ doBTCImport doDecrypt db (ms,subspec,content) = do
     flip (maybe $ return db)
          (listToMaybe parsedkey) $ \key -> do
     let (m0,tailms) = splitAt 1 ms
-    when (not (null tailms) || null m0)
+    unless ((null tailms) || null m0)
         $ error "Key specification is ambiguous."
     doImportG doDecrypt db m0 tag "" key
 -}
@@ -512,7 +513,7 @@ whoseKey :: RSAPublicKey -> KeyDB -> [KeyData]
 whoseKey rsakey db = filter matchkey (Map.elems db)
  where
     matchkey (KeyData k _ _ subs) =
-        not . null .  filter (ismatch k) $ Map.elems subs
+        any (ismatch k) $ Map.elems subs
 
     ismatch k (SubKey mp sigs) = 
           Just rsakey == rsaKeyFromPacket (packet mp)
@@ -530,8 +531,7 @@ whoseKey rsakey db = filter matchkey (Map.elems db)
         signatures_over $ verify (Message [sub]) s2
 
 
-kiki_usage = do
-    putStr . unlines $
+kiki_usage = putStr . unlines $
         ["kiki - a pgp key editing utility"
         ,""
         ,"kiki [OPTIONS]"
@@ -680,7 +680,7 @@ main = do
     unkeysRef <- newIORef Map.empty
     pwRef <- newIORef Nothing
     let keypairs0 =
-            flip map (maybe [] id $ Map.lookup "--keypairs" margs) $ \specfile -> do
+            flip map (fromMaybe [] $ Map.lookup "--keypairs" margs) $ \specfile -> do
                 let (spec,efilecmd) = break (=='=') specfile
                 guard $ take 1 efilecmd=="="
                 let filecmd = drop 1 efilecmd
@@ -693,17 +693,17 @@ main = do
                 Just (spec,file,cmd)
         {-
         publics =
-            flip map (maybe [] id $ Map.lookup "--public" margs) $ \specfile -> do
+            flip map (fromMaybe [] $ Map.lookup "--public" margs) $ \specfile -> do
                 let (spec,efile) = break (=='=') specfile
                 guard $ take 1 efile=="="
                 let file= drop 1 efile
                 Just (spec,file)
         -}
-        keyrings_ = maybe [] id $ Map.lookup "--keyrings" margs
-        wallets   = maybe [] id $ Map.lookup "--wallets" margs
+        keyrings_ = fromMaybe [] $ Map.lookup "--keyrings" margs
+        wallets   = fromMaybe [] $ Map.lookup "--wallets" margs
         passphrase_fd = concat <$> Map.lookup "--passphrase-fd" margs
 
-    when (not . null $ filter isNothing keypairs0) $ do
+    unless (any isNothing keypairs0) $ do
         warn "syntax error"
         exitFailure
 
@@ -749,8 +749,7 @@ main = do
                 ++ pems
                 ++ walts
                 ++ hosts
-            , kImports = Map.fromList $
-                [ ( HomePub, importStyle ) ]
+            , kImports = Map.fromList [ ( HomePub, importStyle ) ]
             , kManip = maybe noManip (const doAutosign) $ Map.lookup "--autosign" margs
             , homeSpec = homespec
             }
@@ -761,19 +760,19 @@ main = do
       KikiSuccess rt -> do -- interpret --show-* commands.
             let grip = rtGrip rt
             let shspec = Map.fromList [("--show-wk", const $ show_wk (rtSecring rt) grip)
-                                      ,("--show-all",const $ show_all)
+                                      ,("--show-all",const show_all)
                                       ,("--show-whose-key", const $ show_whose_key input_key)
-                                      ,("--show-key",\[x] -> show_key x $ maybe "" id grip)
-                                      ,("--show-pem",\[x] -> show_pem x $ maybe "" id grip)
-                                      ,("--show-ssh",\[x] -> show_ssh x $ maybe "" id grip)
-                                      ,("--show-wip",\[x] -> show_wip x $ maybe "" id grip)
+                                      ,("--show-key",\[x] -> show_key x $ fromMaybe "" grip)
+                                      ,("--show-pem",\[x] -> show_pem x $ fromMaybe "" grip)
+                                      ,("--show-ssh",\[x] -> show_ssh x $ fromMaybe "" grip)
+                                      ,("--show-wip",\[x] -> show_wip x $ fromMaybe "" grip)
                                       ,("--help", \_ _ ->kiki_usage)]
                 shargs = mapMaybe (\(x:xs) -> (,xs) <$> Map.lookup x shspec) sargs
 
             forM_ shargs $ \(cmd,args) -> cmd args (rtKeyDB rt)
-      e -> putStrLn $ show (fmap (const ()) e)
+      e -> print (void e)--(fmap (const ()) e)
 
-    putStrLn $ show report
+    print report
     return()
  where
 
@@ -788,7 +787,7 @@ main = do
                             , fmap (match . fst) (lookup (packet k) torbindings)
                                 == Just True ]
                       where parsed = parseUID str
-                            match = ( (==subdom) . take (fromIntegral len))
+                            match =  (==subdom) . take (fromIntegral len)
                             subdom0 = L.fromChunks [encodeUtf8 (uid_subdomain parsed)]
                             subdom = Char8.unpack subdom0
                             len = T.length (uid_subdomain parsed)
@@ -797,7 +796,7 @@ main = do
         xs <- groupBindings pub
         (_,(top,sub),us,_,_) <- xs
         guard ("tor" `elem` us)
-        let torhash = maybe "" id $ derToBase32 <$> derRSA sub
+        let torhash = fromMaybe "" $ derToBase32 <$> derRSA sub
         return (top,(torhash,sub))
 
 isSameKey a b = sort (key apub) == sort (key bpub)
@@ -823,7 +822,7 @@ groupBindings pub =
 {-
 makeTorUID g timestamp wkun keyflags topkey torkey = uid:signatures_over sig
  where
-    torhash sub = maybe "" id $ derToBase32 <$> derRSA sub
+    torhash sub = fromMaybe "" $ derToBase32 <$> derRSA sub
     s = "Anonymous <root@" ++ take 16 (torhash torkey) ++ ".onion>"
     uid = UserIDPacket s
     sig = fst $ torsig g topkey wkun uid timestamp keyflags