kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25994 from luki446/windows-path-terminal-fix

Browse Source 
Fix a bug in usage of windows-style paths as SHELL path.
This commit is contained in:
zeertzjq 2023-11-30 07:56:47 +08:00 committed by GitHub
commit 463b577afb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_docmd.c
View File

@ -7424,7 +7424,9 @@ static void ex_terminal(exarg_T *eap)
char shell_argv[512] = { 0 }; char shell_argv[512] = { 0 };
while (*p != NULL) { while (*p != NULL) {
snprintf(tempstring, sizeof(tempstring), ",\"%s\"", *p); char *escaped = vim_strsave_escaped(*p, "\"\\");
snprintf(tempstring, sizeof(tempstring), ",\"%s\"", escaped);
xfree(escaped);
xstrlcat(shell_argv, tempstring, sizeof(shell_argv)); xstrlcat(shell_argv, tempstring, sizeof(shell_argv));
p++; p++;
} }

24
test/functional/terminal/ex_terminal_spec.lua
View File

@ -141,15 +141,20 @@ describe(':terminal', function()
end) end)
end) end)
describe(':terminal (with fake shell)', function() local function test_terminal_with_fake_shell(backslash)
-- shell-test.c is a fake shell that prints its arguments and exits.
local shell_path = testprg('shell-test')
if backslash then
shell_path = shell_path:gsub('/', [[\]])
end
local screen local screen
before_each(function() before_each(function()
clear() clear()
screen = Screen.new(50, 4) screen = Screen.new(50, 4)
screen:attach({rgb=false}) screen:attach({rgb=false})
-- shell-test.c is a fake shell that prints its arguments and exits. nvim('set_option_value', 'shell', shell_path, {})
nvim('set_option_value', 'shell', testprg('shell-test'), {})
nvim('set_option_value', 'shellcmdflag', 'EXE', {}) nvim('set_option_value', 'shellcmdflag', 'EXE', {})
nvim('set_option_value', 'shellxquote', '', {}) nvim('set_option_value', 'shellxquote', '', {})
end) end)
@ -189,7 +194,7 @@ describe(':terminal (with fake shell)', function()
end) end)
it("with no argument, but 'shell' has arguments, acts like termopen()", function() it("with no argument, but 'shell' has arguments, acts like termopen()", function()
nvim('set_option_value', 'shell', testprg('shell-test')..' -t jeff', {}) nvim('set_option_value', 'shell', shell_path ..' -t jeff', {})
terminal_with_fake_shell() terminal_with_fake_shell()
screen:expect([[ screen:expect([[
^jeff $ | ^jeff $ |
@ -211,7 +216,7 @@ describe(':terminal (with fake shell)', function()
end) end)
it("executes a given command through the shell, when 'shell' has arguments", function() it("executes a given command through the shell, when 'shell' has arguments", function()
nvim('set_option_value', 'shell', testprg('shell-test')..' -t jeff', {}) nvim('set_option_value', 'shell', shell_path ..' -t jeff', {})
command('set shellxquote=') -- win: avoid extra quotes command('set shellxquote=') -- win: avoid extra quotes
terminal_with_fake_shell('echo hi') terminal_with_fake_shell('echo hi')
screen:expect([[ screen:expect([[
@ -304,4 +309,13 @@ describe(':terminal (with fake shell)', function()
terminal]]) terminal]])
end end
end) end)
end
describe(':terminal (with fake shell)', function()
test_terminal_with_fake_shell(false)
if is_os('win') then
describe("when 'shell' uses backslashes", function()
test_terminal_with_fake_shell(true)
end)
end
end) end)