slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: Escape special symbols when passing arguments to addons

Browse Source
This commit is contained in:
Caleb Maclennan 2025-09-30 20:14:52 -06:00 committed by Simon Michael
parent abc559f39a
commit 8cbe4c6003
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hledger/Hledger/Cli.hs
View File

@ -452,9 +452,9 @@ main = handleExit $ withGhcDebug' $ do
let let
addonargs0 = filter (/="--") $ supportedgenargsfromconf <> confcmdargs <> cliargswithoutcmd addonargs0 = filter (/="--") $ supportedgenargsfromconf <> confcmdargs <> cliargswithoutcmd
addonargs = dropCliSpecificOpts addonargs0 addonargs = dropCliSpecificOpts addonargs0
shellcmd = printf "%s-%s %s" progname cmdname (unwords' addonargs) :: String shellcmd = printf "%s-%s %s" progname cmdname (unwords $ map quoteForCommandLine addonargs) :: String
dbgio "addon command selected" cmdname dbgio "addon command selected" cmdname
dbgio "addon command arguments after removing cli-specific opts" (map quoteIfNeeded addonargs) dbgio "addon command arguments" addonargs
dbg1IO "running addon" shellcmd dbg1IO "running addon" shellcmd
system shellcmd >>= exitWith system shellcmd >>= exitWith

2
hledger/Hledger/Cli/Commands/Run.hs
View File

@ -160,7 +160,7 @@ runCommand defaultJournalOverride findBuiltinCommand addons cmdline = do
then run (Just jpaths) findBuiltinCommand addons opts then run (Just jpaths) findBuiltinCommand addons opts
else cmdaction opts j else cmdaction opts j
Nothing | cmdname `elem` addons -> Nothing | cmdname `elem` addons ->
system (printf "%s-%s %s" progname cmdname (unwords' args)) >>= exitWith system (printf "%s-%s %s" progname cmdname (unwords $ map quoteForCommandLine args)) >>= exitWith
Nothing -> Nothing ->
error' $ "Unrecognized command: " ++ unwords (cmdname:args) error' $ "Unrecognized command: " ++ unwords (cmdname:args)
[] -> return () [] -> return ()