Remove specialized shell escape function
The cases this was guarding against aren't actually relevant any more.
This commit is contained in:
parent
fc5167b939
commit
8ad87d4fba
@ -16,21 +16,6 @@ augroup END
|
|||||||
" }}}1
|
" }}}1
|
||||||
" Escaping {{{1
|
" Escaping {{{1
|
||||||
|
|
||||||
function! foreplay#shellesc(arg) abort
|
|
||||||
if a:arg =~ '^[A-Za-z0-9_/.-]\+$'
|
|
||||||
return a:arg
|
|
||||||
elseif &shell =~# 'cmd'
|
|
||||||
return '"'.substitute(substitute(a:arg, '"', '""', 'g'), '%', '"%"', 'g').'"'
|
|
||||||
else
|
|
||||||
let escaped = shellescape(a:arg)
|
|
||||||
if &shell =~# 'sh' && &shell !~# 'csh'
|
|
||||||
return substitute(escaped, '\\\n', '\n', 'g')
|
|
||||||
else
|
|
||||||
return escaped
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfunction
|
|
||||||
|
|
||||||
function! s:str(string)
|
function! s:str(string)
|
||||||
return '"' . escape(a:string, '"\') . '"'
|
return '"' . escape(a:string, '"\') . '"'
|
||||||
endfunction
|
endfunction
|
||||||
@ -297,7 +282,7 @@ function! s:oneoff.eval(expr, options) dict abort
|
|||||||
call writefile([], s:oneoff_out, 'b')
|
call writefile([], s:oneoff_out, 'b')
|
||||||
call writefile([], s:oneoff_err, 'b')
|
call writefile([], s:oneoff_err, 'b')
|
||||||
let command = g:java_cmd.' -cp '.shellescape(self.classpath).' clojure.main -e ' .
|
let command = g:java_cmd.' -cp '.shellescape(self.classpath).' clojure.main -e ' .
|
||||||
\ foreplay#shellesc(
|
\ shellescape(
|
||||||
\ '(binding [*out* (java.io.FileWriter. '.s:str(s:oneoff_out).')' .
|
\ '(binding [*out* (java.io.FileWriter. '.s:str(s:oneoff_out).')' .
|
||||||
\ ' *err* (java.io.FileWriter. '.s:str(s:oneoff_err).')]' .
|
\ ' *err* (java.io.FileWriter. '.s:str(s:oneoff_err).')]' .
|
||||||
\ ' (try' .
|
\ ' (try' .
|
||||||
|
Loading…
Reference in New Issue
Block a user