safe output to terminal for calckey inprogress and lookupkey

These are quite low-level, but still there is no point in displaying
escape sequences that have been embedded in a key to the terminal.

I think these are the only remaining commands that didn't use safe
output, except for cases where git-annex is speaking a protocol to
itself.

Sponsored-by: Kevin Mueller on Patreon
This commit is contained in:
Joey Hess 2023-04-12 14:03:44 -04:00
parent a576fc3b12
commit 3346aa9659
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 24 additions and 12 deletions

View file

@ -10,6 +10,8 @@ module Command.LookupKey where
import Command
import Annex.CatFile
import qualified Git.LsFiles
import Utility.Terminal
import Utility.SafeOutput
cmd :: Command
cmd = notBareRepo $ noCommit $ noMessages $
@ -23,7 +25,9 @@ run _ _ file = seekSingleGitFile file >>= \case
Nothing -> return False
Just file' -> catKeyFile file' >>= \case
Just k -> do
liftIO $ putStrLn $ serializeKey k
IsTerminal isterminal <- liftIO $ checkIsTerminal stdout
let sk = serializeKey k
liftIO $ putStrLn $ if isterminal then safeOutput sk else sk
return True
Nothing -> return False