mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

use ShellParam type

Browse source 
So, I have a type checked safe handling of filenames starting with dashes,
throughout the code.
This commit is contained in:
Joey Hess 2011-02-28 16:10:16 -04:00
parent 7e5678bcf7
commit fcdc4797a9
24 changed files with 151 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Backend/SHA1.hs
View file

@ -32,7 +32,7 @@ backend = Backend.File.backend {
sha1 :: FilePath -> Annex String
sha1 file = do
showNote "checksum..."
liftIO $ pOpen ReadFromPipe "sha1sum" [utilityEscape file] $ \h -> do
liftIO $ pOpen ReadFromPipe "sha1sum" (toShell [File file]) $ \h -> do
line <- hGetLine h
let bits = split " " line
if null bits

2
Backend/URL.hs
View file

@ -51,6 +51,6 @@ downloadUrl :: Key -> FilePath -> Annex Bool
downloadUrl key file = do
showNote "downloading"
showProgress -- make way for curl progress bar
liftIO $ boolSystem "curl" ["-#", "-o", utilityEscape file, url]
liftIO $ boolSystem "curl" [Params "-# -o", File file, File url]
where
url = join ":" $ drop 1 $ split ":" $ show key