7x31/shellcheck
1
0
Fork 0
mirror of https://github.com/koalaman/shellcheck.git synced 2025-09-20 02:33:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken recursive backtick expansion.

Browse Source
This commit is contained in:
Vidar Holen
2013-07-09 21:53:15 -07:00
parent 8055b6f9c5
commit d04262c70f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ShellCheck/Analytics.hs
View File

@@ -281,6 +281,7 @@ checkUuoc (T_Pipeline _ ((T_Redirecting _ _ cmd):_:_)) = checkCommand "cat" f cm
checkUuoc _ = return () checkUuoc _ = return ()
prop_checkNeedlessCommands = verify checkNeedlessCommands "foo=$(expr 3 + 2)" prop_checkNeedlessCommands = verify checkNeedlessCommands "foo=$(expr 3 + 2)"
prop_checkNeedlessCommands2 = verify checkNeedlessCommands "foo=`echo \\`expr 3 + 2\\``"
checkNeedlessCommands (T_SimpleCommand id _ (w:_)) | w `isCommand` "expr" = checkNeedlessCommands (T_SimpleCommand id _ (w:_)) | w `isCommand` "expr" =
style id "Use $((..)), ${} or [[ ]] in place of antiquated expr." style id "Use $((..)), ${} or [[ ]] in place of antiquated expr."
checkNeedlessCommands (T_SimpleCommand id _ (w:_)) | w `isCommand` "dirname" = checkNeedlessCommands (T_SimpleCommand id _ (w:_)) | w `isCommand` "dirname" =

7
ShellCheck/Parser.hs
View File

@@ -672,7 +672,7 @@ readBackTicked = called "backtick expansion" $ do
subStart <- getPosition subStart <- getPosition
subString <- readGenericLiteral (char '`') subString <- readGenericLiteral (char '`')
char '`' char '`'
result <- subParse subStart readCompoundList subString result <- subParse subStart readCompoundList (unEscape subString)
return $ T_Backticked id result return $ T_Backticked id result
where where
-- Position may be off due to escapes -- Position may be off due to escapes
@@ -685,6 +685,11 @@ readBackTicked = called "backtick expansion" $ do
setInput lastInput setInput lastInput
setPosition lastPosition setPosition lastPosition
return result return result
unEscape [] = []
unEscape ('\\':x:rest) | x `elem` "\"$`\\" = x : unEscape rest
unEscape ('\\':'\n':rest) = unEscape rest
unEscape (c:rest) = c : unEscape rest
prop_readDoubleQuoted = isOk readDoubleQuoted "\"Hello $FOO\"" prop_readDoubleQuoted = isOk readDoubleQuoted "\"Hello $FOO\""
readDoubleQuoted = called "double quoted string" $ do readDoubleQuoted = called "double quoted string" $ do