From c61890f1b767fae5b43d32bfee7b9ba01cbe2493 Mon Sep 17 00:00:00 2001 From: Jeremy Cantrell Date: Fri, 24 Sep 2010 10:36:53 +0800 Subject: [PATCH] Properly escape % for makeprg --- syntax_checkers/c.vim | 4 ++-- syntax_checkers/cpp.vim | 4 ++-- syntax_checkers/cucumber.vim | 2 +- syntax_checkers/eruby.vim | 2 +- syntax_checkers/haskell.vim | 2 +- syntax_checkers/html.vim | 2 +- syntax_checkers/javascript.vim | 2 +- syntax_checkers/perl.vim | 2 +- syntax_checkers/php.vim | 2 +- syntax_checkers/python.vim | 2 +- syntax_checkers/ruby.vim | 2 +- syntax_checkers/sass.vim | 2 +- syntax_checkers/tex.vim | 2 +- syntax_checkers/xhtml.vim | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/syntax_checkers/c.vim b/syntax_checkers/c.vim index 85388fbe..4a7ef873 100644 --- a/syntax_checkers/c.vim +++ b/syntax_checkers/c.vim @@ -80,12 +80,12 @@ function! s:Init() endfunction function! SyntaxCheckers_c_GetLocList() - let makeprg = 'gcc -fsyntax-only %' + let makeprg = 'gcc -fsyntax-only '.shellescape(expand('%')) let errorformat = '%-G%f:%s:,%f:%l: %m' if expand('%') =~? '.h$' if exists('g:syntastic_c_check_header') - let makeprg = 'gcc -c %' + let makeprg = 'gcc -c '.shellescape(expand('%')) else return [] endif diff --git a/syntax_checkers/cpp.vim b/syntax_checkers/cpp.vim index 04c39071..aa7f8587 100644 --- a/syntax_checkers/cpp.vim +++ b/syntax_checkers/cpp.vim @@ -25,12 +25,12 @@ if !executable('g++') endif function! SyntaxCheckers_cpp_GetLocList() - let makeprg = 'g++ -fsyntax-only %' + let makeprg = 'g++ -fsyntax-only '.shellescape(expand('%')) let errorformat = '%-G%f:%s:,%f:%l: %m' if expand('%') =~? '\%(.h\|.hpp\|.hh\)$' if exists('g:syntastic_cpp_check_header') - let makeprg = 'g++ -c %' + let makeprg = 'g++ -c '.shellescape(expand('%')) else return [] endif diff --git a/syntax_checkers/cucumber.vim b/syntax_checkers/cucumber.vim index 813858e7..c9a87e15 100644 --- a/syntax_checkers/cucumber.vim +++ b/syntax_checkers/cucumber.vim @@ -20,7 +20,7 @@ if !executable("cucumber") endif function! SyntaxCheckers_cucumber_GetLocList() - let makeprg = 'cucumber --dry-run --quiet --strict --format pretty %' + let makeprg = 'cucumber --dry-run --quiet --strict --format pretty '.shellescape(expand('%')) let errorformat = '%f:%l:%c:%m,%W %.%# (%m),%-Z%f:%l:%.%#,%-G%.%#' return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/eruby.vim b/syntax_checkers/eruby.vim index 7145d9ff..af07270b 100644 --- a/syntax_checkers/eruby.vim +++ b/syntax_checkers/eruby.vim @@ -20,7 +20,7 @@ if !executable("ruby") || !executable("cat") endif function! SyntaxCheckers_eruby_GetLocList() - let makeprg='cat '. expand("%") . ' \| RUBYOPT= ruby -e "require \"erb\"; puts ERB.new(ARGF.read, nil, \"-\").src" \| RUBYOPT= ruby -c' + let makeprg='cat '. shellescape(expand("%")) . ' \| RUBYOPT= ruby -e "require \"erb\"; puts ERB.new(ARGF.read, nil, \"-\").src" \| RUBYOPT= ruby -c' let errorformat='%-GSyntax OK,%E-:%l: syntax error\, %m,%Z%p^,%W-:%l: warning: %m,%Z%p^,%-C%.%#' let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/haskell.vim b/syntax_checkers/haskell.vim index 339be871..c5bc397a 100644 --- a/syntax_checkers/haskell.vim +++ b/syntax_checkers/haskell.vim @@ -22,7 +22,7 @@ endif " As this calls ghc, it can take a few seconds... maybe hlint or something " could do a good enough job? function! SyntaxCheckers_haskell_GetLocList() - let makeprg = 'ghc % -e :q' + let makeprg = 'ghc '.shellescape(expand('%')).' -e :q' let errorformat = '%-G\\s%#,%f:%l:%c:%m,%E%f:%l:%c:,%Z%m,' diff --git a/syntax_checkers/html.vim b/syntax_checkers/html.vim index 8f98da6d..e9d66742 100644 --- a/syntax_checkers/html.vim +++ b/syntax_checkers/html.vim @@ -23,7 +23,7 @@ function! SyntaxCheckers_html_GetLocList() "grep out the ' lacks "summary" attribute' since it is almost "always present and almost always useless - let makeprg="tidy -e % 2>&1 \\| grep -v '\ lacks \"summary\" attribute'" + let makeprg="tidy -e "..shellescape(expand('%'))." 2>&1 \\| grep -v '\ lacks \"summary\" attribute'" let errorformat='%Wline %l column %c - Warning: %m,%Eline %l column %c - Error: %m,%-G%.%#,%-G%.%#' let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/javascript.vim b/syntax_checkers/javascript.vim index 0f3cc3b8..e3477585 100644 --- a/syntax_checkers/javascript.vim +++ b/syntax_checkers/javascript.vim @@ -20,7 +20,7 @@ if !executable("jsl") endif function! SyntaxCheckers_javascript_GetLocList() - let makeprg = "jsl -nologo -nofilelisting -nosummary -nocontext -process %" + let makeprg = "jsl -nologo -nofilelisting -nosummary -nocontext -process ".shellescape(expand('%')) let errorformat='%W%f(%l): lint warning: %m,%-Z%p^,%W%f(%l): warning: %m,%-Z%p^,%E%f(%l): SyntaxError: %m,%-Z%p^,%-G' return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) endfunction diff --git a/syntax_checkers/perl.vim b/syntax_checkers/perl.vim index fb70b078..d79c6061 100644 --- a/syntax_checkers/perl.vim +++ b/syntax_checkers/perl.vim @@ -24,7 +24,7 @@ if !executable("perl") endif function! SyntaxCheckers_perl_GetLocList() - let makeprg = $VIMRUNTIME.'/tools/efm_perl.pl -c %' + let makeprg = $VIMRUNTIME.'/tools/efm_perl.pl -c '.shellescape(expand('%')) let errorformat = '%f:%l:%m' return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/php.vim b/syntax_checkers/php.vim index 7dd0cd7e..33a339cd 100644 --- a/syntax_checkers/php.vim +++ b/syntax_checkers/php.vim @@ -20,7 +20,7 @@ if !executable("php") endif function! SyntaxCheckers_php_GetLocList() - let makeprg = "php -l %" + let makeprg = "php -l ".shellescape(expand('%')) let errorformat='%-GNo syntax errors detected in%.%#,PHP Parse error: %#syntax %trror\, %m in %f on line %l,PHP Fatal %trror: %m in %f on line %l,%-GErrors parsing %.%#,%-G\s%#,Parse error: %#syntax %trror\, %m in %f on line %l,Fatal %trror: %m in %f on line %l' return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) endfunction diff --git a/syntax_checkers/python.vim b/syntax_checkers/python.vim index e95c5321..10abe7f1 100644 --- a/syntax_checkers/python.vim +++ b/syntax_checkers/python.vim @@ -9,7 +9,7 @@ if !executable("pyflakes") endif function! SyntaxCheckers_python_GetLocList() - let makeprg = 'pyflakes %' + let makeprg = 'pyflakes '.shellescape(expand('%')) let errorformat = '%E%f:%l: could not compile,%-Z%p^,%W%f:%l: %m,%-G%.%#' let errors = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/ruby.vim b/syntax_checkers/ruby.vim index a4dfce88..b15decab 100644 --- a/syntax_checkers/ruby.vim +++ b/syntax_checkers/ruby.vim @@ -20,7 +20,7 @@ if !executable("ruby") endif function! SyntaxCheckers_ruby_GetLocList() - let makeprg = 'RUBYOPT= ruby -W1 -c %' + let makeprg = 'RUBYOPT= ruby -W1 -c '.shellescape(expand('%')) let errorformat = '%-GSyntax OK,%E%f:%l: syntax error\, %m,%Z%p^,%W%f:%l: warning: %m,%Z%p^,%-C%.%#' return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/sass.vim b/syntax_checkers/sass.vim index 235f18f6..2bfa1ab4 100644 --- a/syntax_checkers/sass.vim +++ b/syntax_checkers/sass.vim @@ -20,7 +20,7 @@ if !executable("sass") endif function! SyntaxCheckers_sass_GetLocList() - let makeprg='sass --check %' + let makeprg='sass --check '.shellescape(expand('%')) let errorformat = '%Wwarning on line %l:,%Z%m,Syntax %trror on line %l: %m' let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) diff --git a/syntax_checkers/tex.vim b/syntax_checkers/tex.vim index cd264713..7d7f019c 100644 --- a/syntax_checkers/tex.vim +++ b/syntax_checkers/tex.vim @@ -20,7 +20,7 @@ if !executable("lacheck") endif function! SyntaxCheckers_tex_GetLocList() - let makeprg = 'lacheck %' + let makeprg = 'lacheck '.shellescape(expand('%')) let errorformat = '%E"%f"\, line %l: %m' return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat }) endfunction diff --git a/syntax_checkers/xhtml.vim b/syntax_checkers/xhtml.vim index f1c7bb11..399e035c 100644 --- a/syntax_checkers/xhtml.vim +++ b/syntax_checkers/xhtml.vim @@ -21,7 +21,7 @@ endif function! SyntaxCheckers_xhtml_GetLocList() - let makeprg="tidy -xml -e %" + let makeprg="tidy -xml -e ".shellescape(expand('%')) let errorformat='%Wline %l column %c - Warning: %m,%Eline %l column %c - Error: %m,%-G%.%#,%-G%.%#' let loclist = SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })