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

improve parser robustness

Browse source
This commit is contained in:
Joey Hess 2013-12-06 18:26:52 -04:00
parent 4d5e0a90ed
commit ce3f5138c2
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Build/EvilLinker.hs
View file

@ -81,17 +81,16 @@ parseGccLink = do
{- Find where collect2 calls ld. -} {- Find where collect2 calls ld. -}
parseCollect2 :: Parser CmdParams parseCollect2 :: Parser CmdParams
parseCollect2 = do parseCollect2 = do
try $ do manyTill restOfLine (try versionline)
string "GNU ld"
restOfLine
string "collect2 version"
restOfLine
path <- manyTill anyChar (try $ string ldcmd) path <- manyTill anyChar (try $ string ldcmd)
char ' ' char ' '
params <- restOfLine params <- restOfLine
return $ CmdParams (path ++ ldcmd) (escapeDosPaths params) Nothing return $ CmdParams (path ++ ldcmd) (escapeDosPaths params) Nothing
where where
ldcmd = "ld.exe" ldcmd = "ld.exe"
versionline = do
string "collect2 version"
restOfLine
{- Input contains something like {- Input contains something like
- c:/program files/haskell platform/foo -LC:/Program Files/Haskell Platform/ -L... - c:/program files/haskell platform/foo -LC:/Program Files/Haskell Platform/ -L...