IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0442: patch shell command not well escaped

Browse Source 
Problem:    Patch shell command uses double quotes around the argument, which
            allows for $HOME to be expanded. (Etienne)
Solution:   Use single quotes on Unix. (closes vim/vim#1543)

1ef73e33c9
This commit is contained in:
Justin M. Keyes 2018-01-21 10:28:52 +01:00
parent ce09d4134b
commit 456cf72974
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/diff.c
View File

@ -925,7 +925,7 @@ void ex_diffpatch(exarg_T *eap)
} else { } else {
// Build the patch command and execute it. Ignore errors. // Build the patch command and execute it. Ignore errors.
#ifdef UNIX #ifdef UNIX
vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", vim_snprintf((char *)buf, buflen, "patch -o %s %s < '%s'",
tmp_new, tmp_orig, fullname != NULL ? fullname : eap->arg); tmp_new, tmp_orig, fullname != NULL ? fullname : eap->arg);
#else #else
vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"", vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",

17
src/nvim/testdir/test_diffmode.vim
View File

@ -501,9 +501,20 @@ func Test_diffpatch()
bwipe! bwipe!
new new
call assert_fails('diffpatch Xpatch', 'E816:') call assert_fails('diffpatch Xpatch', 'E816:')
call setline(1, ['1', '2', '3'])
diffpatch Xpatch for name in ['Xpatch', 'Xpatch$HOME']
call assert_equal(['1', '2x', '3', '4'], getline(1, '$')) call setline(1, ['1', '2', '3'])
if name != 'Xpatch'
call rename('Xpatch', name)
endif
exe 'diffpatch ' . escape(name, '$')
call assert_equal(['1', '2x', '3', '4'], getline(1, '$'))
if name != 'Xpatch'
call rename(name, 'Xpatch')
endif
bwipe!
endfor
call delete('Xpatch') call delete('Xpatch')
bwipe! bwipe!
endfunc endfunc