From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 1 Sep 2021 12:31:51 +0000 (+0200)
Subject: patch 8.2.3393: escaping for fish shell is skipping some characters
X-Git-Tag: v8.2.3393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6631597452d4644f485a09e4036d117e5f91de70;p=vim

patch 8.2.3393: escaping for fish shell is skipping some characters

Problem:    Escaping for fish shell is skipping some characters.
Solution:   Escape character after backslash if needed. (Jason Cox,
            closes #8827)
---

diff --git a/src/strings.c b/src/strings.c
index 0c9e20d17..d2d37d80f 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -281,6 +281,7 @@ vim_strsave_shellescape(char_u *string, int do_special, int do_newline)
 	    {
 		*d++ = '\\';
 		*d++ = *p++;
+		continue;
 	    }
 
 	    MB_COPY_CHAR(p, d);
diff --git a/src/testdir/test_shell.vim b/src/testdir/test_shell.vim
index fa11f08d7..a6aa10ea2 100644
--- a/src/testdir/test_shell.vim
+++ b/src/testdir/test_shell.vim
@@ -61,21 +61,21 @@ func Test_shell_options()
   for e in shells
     exe 'set shell=' .. e[0]
     if e[0] =~# '.*csh$' || e[0] =~# '.*csh.exe$'
-      let str1 = "'cmd \"arg1\" '\\''arg2'\\'' \\!%# \\'"
-      let str2 = "'cmd \"arg1\" '\\''arg2'\\'' \\\\!\\%\\# \\'"
+      let str1 = "'cmd \"arg1\" '\\''arg2'\\'' \\!%# \\'\\'' \\\\! \\% \\#'"
+      let str2 = "'cmd \"arg1\" '\\''arg2'\\'' \\\\!\\%\\# \\'\\'' \\\\\\! \\\\% \\\\#'"
     elseif e[0] =~# '.*powershell$' || e[0] =~# '.*powershell.exe$'
           \ || e[0] =~# '.*pwsh$' || e[0] =~# '.*pwsh.exe$'
-      let str1 = "'cmd \"arg1\" ''arg2'' !%# \\'"
-      let str2 = "'cmd \"arg1\" ''arg2'' \\!\\%\\# \\'"
+      let str1 = "'cmd \"arg1\" ''arg2'' !%# \\'' \\! \\% \\#'"
+      let str2 = "'cmd \"arg1\" ''arg2'' \\!\\%\\# \\'' \\\\! \\\\% \\\\#'"
     elseif e[0] =~# '.*fish$' || e[0] =~# '.*fish.exe$'
-      let str1 = "'cmd \"arg1\" '\\''arg2'\\'' !%# \\\\'"
-      let str2 = "'cmd \"arg1\" '\\''arg2'\\'' \\!\\%\\# \\\\'"
+      let str1 = "'cmd \"arg1\" '\\''arg2'\\'' !%# \\\\'\\'' \\\\! \\\\% \\\\#'"
+      let str2 = "'cmd \"arg1\" '\\''arg2'\\'' \\!\\%\\# \\\\'\\'' \\\\\\! \\\\\\% \\\\\\#'"
     else
-      let str1 = "'cmd \"arg1\" '\\''arg2'\\'' !%# \\'"
-      let str2 = "'cmd \"arg1\" '\\''arg2'\\'' \\!\\%\\# \\'"
+      let str1 = "'cmd \"arg1\" '\\''arg2'\\'' !%# \\'\\'' \\! \\% \\#'"
+      let str2 = "'cmd \"arg1\" '\\''arg2'\\'' \\!\\%\\# \\'\\'' \\\\! \\\\% \\\\#'"
     endif
-    call assert_equal(str1, shellescape("cmd \"arg1\" 'arg2' !%# \\"), e[0])
-    call assert_equal(str2, shellescape("cmd \"arg1\" 'arg2' !%# \\", 1), e[0])
+    call assert_equal(str1, shellescape("cmd \"arg1\" 'arg2' !%# \\' \\! \\% \\#"), e[0])
+    call assert_equal(str2, shellescape("cmd \"arg1\" 'arg2' !%# \\' \\! \\% \\#", 1), e[0])
 
     " Try running an external command with the shell.
     if executable(e[0])
diff --git a/src/version.c b/src/version.c
index 9f67d7964..3a16ddad8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3393,
 /**/
     3392,
 /**/