Skip to content

Commit

Permalink
patch 8.0.0444: diffpatch fails when the file name has a quote
Browse files Browse the repository at this point in the history
Problem:    Diffpatch fails when the file name has a quote.
Solution:   Escape the name properly. (zetzei)
  • Loading branch information
brammool committed Mar 11, 2017
1 parent 38a3d6c commit a95ab32
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 15 deletions.
24 changes: 10 additions & 14 deletions src/diff.c
Expand Up @@ -906,6 +906,7 @@ ex_diffpatch(exarg_T *eap)
int browse_flag = cmdmod.browse;
#endif
stat_T st;
char_u *esc_name = NULL;

#ifdef FEAT_BROWSE
if (cmdmod.browse)
Expand Down Expand Up @@ -935,11 +936,14 @@ ex_diffpatch(exarg_T *eap)
/* Get the absolute path of the patchfile, changing directory below. */
fullname = FullName_save(eap->arg, FALSE);
#endif
buflen = STRLEN(tmp_orig) + (
esc_name = vim_strsave_shellescape(
# ifdef UNIX
fullname != NULL ? STRLEN(fullname) :
fullname != NULL ? fullname :
# endif
STRLEN(eap->arg)) + STRLEN(tmp_new) + 16;
eap->arg, TRUE, TRUE);
if (esc_name == NULL)
goto theend;
buflen = STRLEN(tmp_orig) + STRLEN(esc_name) + STRLEN(tmp_new) + 16;
buf = alloc((unsigned)buflen);
if (buf == NULL)
goto theend;
Expand Down Expand Up @@ -977,17 +981,8 @@ ex_diffpatch(exarg_T *eap)
{
/* Build the patch command and execute it. Ignore errors. Switch to
* cooked mode to allow the user to respond to prompts. */
vim_snprintf((char *)buf, buflen,
#ifdef UNIX
"patch -o %s %s < '%s'",
#else
"patch -o %s %s < \"%s\"",
#endif
tmp_new, tmp_orig,
# ifdef UNIX
fullname != NULL ? fullname :
# endif
eap->arg);
vim_snprintf((char *)buf, buflen, "patch -o %s %s < %s",
tmp_new, tmp_orig, esc_name);
#ifdef FEAT_AUTOCMD
block_autocmds(); /* Avoid ShellCmdPost stuff */
#endif
Expand Down Expand Up @@ -1078,6 +1073,7 @@ ex_diffpatch(exarg_T *eap)
#ifdef UNIX
vim_free(fullname);
#endif
vim_free(esc_name);
#ifdef FEAT_BROWSE
vim_free(browseFile);
cmdmod.browse = browse_flag;
Expand Down
2 changes: 1 addition & 1 deletion src/testdir/test_diffmode.vim
Expand Up @@ -319,7 +319,7 @@ func Test_diffpatch()
new
call assert_fails('diffpatch Xpatch', 'E816:')

for name in ['Xpatch', 'Xpatch$HOME']
for name in ['Xpatch', 'Xpatch$HOME', 'Xpa''tch']
call setline(1, ['1', '2', '3'])
if name != 'Xpatch'
call rename('Xpatch', name)
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -764,6 +764,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
444,
/**/
443,
/**/
Expand Down

0 comments on commit a95ab32

Please sign in to comment.