-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[RFC] win: defaults: 'shellcmdflag', 'shellxquote' #7343
Conversation
a558f18
to
42bdf92
Compare
All test failures are because of |
It's not chainable (ie cmd /s /c "command_A" && cmd /s /c "command_B"). > cmd /s /c ^"^"echo^" foo\:bar^"^" && cmd /s /c ^"echo foo\:bar^"^"
foo:bar
foo\:bar" |
42bdf92
to
4a80a78
Compare
If the tests pass we can try this out... |
I don't know why the QuickBuild keeps failing. I'm experienced only with Travis and Appveyor so I don't know what to do here. |
The |
142b538
to
90cf20f
Compare
I squashed test commits because the appveyor build passed. First time with Lua so any feedback is appreciated. The suggested defaults are for handling basic commands only. Need more test cases for special characters in cmd.exe, especially |
Close 1018 Run the command as is in cmd.exe with no parsing and escaping. Explicity set cmd.SysProcAttr so execCommand does not escape the command. Technically, the command should be escaped with ^ for special characters, including ". This allows cmd.exe commands to be chained together. See neovim/neovim#7343 (comment) However, this requires a new shellescape function that is specific to one of the following: - interactive prompt - batchfile - command name fzf#shellescape in the Vim plugin can handle only the batchfile.
Close junegunn#1018 Run the command as is in cmd.exe with no parsing and escaping. Explicity set cmd.SysProcAttr so execCommand does not escape the command. Technically, the command should be escaped with ^ for special characters, including ". This allows cmd.exe commands to be chained together. See neovim/neovim#7343 (comment) However, this requires a new shellescape function that is specific to one of the following: - interactive prompt - batchfile - command name fzf#shellescape in the Vim plugin can handle only the batchfile.
68c2696
to
1bcd19b
Compare
@@ -105,9 +105,15 @@ describe(':terminal (with fake shell)', function() | |||
|
|||
it('executes a given command through the shell', function() | |||
terminal_with_fake_shell('echo hi') | |||
screen:expect([[ | |||
local escaped = [[ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of this, can we force the old shellxquote
for these tests? Because it's not important for these tests to test the default value of shellxquote
. Then we avoid lots of churn and also makes it easier to rollback if the new default doesn't work out for some reason.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, because the affected test commands do not require any non-trivial escaping and have 0-1 double quotes. The new shellxquote
is for commands with 2+ double quotes.
@@ -4,8 +4,6 @@ local helpers = require('test.functional.helpers')(after_each) | |||
local feed, command, clear = helpers.feed, helpers.command, helpers.clear | |||
local mkdir, write_file, rmdir = helpers.mkdir, helpers.write_file, helpers.rmdir | |||
|
|||
if helpers.pending_win32(pending) then return end |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice!
@justinmk Do you want a separate PR for the tests to handle the old |
@janlazo Not really, maybe I'm confused by #7343 (comment) Can't we do |
The output of Case 1 is for commands using up to 2 double quotes. These double quotes are useful for escaping a path with special characters mentioned at the bottom of Case 2 is for forcing this dequoting behaviour such that cmd.exe will run the entire command as is. I want to enable more tests to test my assumptions for Case 2 and eventually construct a |
Ok. Can the changes to test/functional/terminal/ex_terminal_spec.lua be avoided or not ? :) |
Yes. I'll work on it tonight. |
70bed4f
to
65686d0
Compare
@justinmk fugitive will be more consistent after this PR because the result of running the command on a cmd.exe session or with |
test/functional/eval/system_spec.lua
Outdated
@@ -354,6 +360,8 @@ describe('systemlist()', function() | |||
eq(5, eval('v:shell_error')) | |||
eval([[systemlist('this-should-not-exist')]]) | |||
eq(1, eval('v:shell_error')) | |||
eval([[systemlist('"ping" "-n" "1" "127.0.0.1"')]]) | |||
eq(0, eval('v:shell_error')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this to test #7698? Doesn't it add 1 second to each test?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This tests #7698 because /c
doesn't support quoted programs with quoted arguments (ie. cmd /c "vim" "-u" "NONE"
). ping -n 1
doesn't add 1 second because the first request runs immediately. -n 1
guarantees 1 request only because, by default, it sends up to 4 requests (ie -n 4
).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, still it would be clearer if we could instead check the output of something like echo or cat.
eq(..., [[systemlist('"echo" "foo" "bar" "baz"')]])
a149ef6
to
424abbc
Compare
50c2c73
to
a1c5a8a
Compare
Looks like |
@justinmk echo.exe is in the C:\msys64\usr\bin or in bin/ folders of msysgit (or git-for-windows) so it's not available by default in Windows 7, 8. I'll test with nested cmd.exe echo or powershell echo with escaped arguments. |
Test on system() and systemlist()
f7e0d05
to
31ac97c
Compare
Can't we just use the examples given in #7698 ? It's not clear if these other elaborate examples with powershell are actually testing the problem from that issue. Let's keep it simple. |
That's covered by more.com and ping.exe since cmd.exe can't run them with an empty PATH (ie. Double-quoting cat in the existing tests for #7698 shouldn't be a problem for sh so I'll update the tests. |
eq('"a b"\r', eval([[get(systemlist('cmd /s/c "cmd /s/c "cmd /s/c "echo "a b""""'), 0, '')]])) | ||
eq(0, eval('v:shell_error')) | ||
eq('"a b"\r', eval([[get(systemlist('powershell -NoProfile -NoLogo -ExecutionPolicy RemoteSigned -Command echo ''\^"a b\^"'''), 0, '')]])) | ||
eq(0, eval('v:shell_error')) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These new tests aren't relevant to this sets v:shell_error
test group.
If we really need to check v:shell_error for these quote/escape tests, just do it in the other tests. I don't think we need to, though.
We need to keep the tests readable where possible.
Assuming the build passes, are you done with changes? |
Yes, if it's okay to keep the redundant tests that you mentioned. |
@@ -464,7 +491,7 @@ describe('systemlist()', function() | |||
after_each(delete_file(fname)) | |||
|
|||
it('replaces NULs by newline characters', function() | |||
eq({'part1\npart2\npart3'}, eval('systemlist("cat '..fname..'")')) | |||
eq({'part1\npart2\npart3'}, eval([[systemlist('"cat" "]]..fname..[["')]])) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is quoting like this now required, or is this change just to test #7698 ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not required but #7698 had it. Other tests using cat aren't quoted and work fine.
@@ -239,6 +254,8 @@ describe('system()', function() | |||
end | |||
end) | |||
it('to backgrounded command does not crash', function() | |||
-- cmd.exe doesn't background a command with & | |||
if iswin() then return end | |||
-- This is indeterminate, just exercise the codepath. May get E5677. | |||
feed_command('call system("echo -n echoed &")') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this test now fails? (Even if it was useless before, just want to confirm that the new default now causes this kind of thing to fail.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's passes before and after this change. I disabled but the test isn't doing what it is described to do.
closes #7698 Wrapping a command in double-quotes allows cmd.exe to safely dequote the entire command as if the user entered the entire command in an interactive prompt. This reduces the need to escape nested and uneven double quotes. The `/s` flag of cmd.exe makes the behaviour more reliable: :set shellcmdflag=/s\ /c Before this patch, cmd.exe cannot use cygwin echo.exe (as opposed to cmd.exe `echo` builtin) even if it is wrapped in double quotes. Example: :: internal echo > cmd /s /c " echo foo\:bar" " foo\:bar" :: cygwin echo.exe > cmd /s /c " "echo" foo\:bar" " foo:bar
Merged. I removed the tests from the |
FEATURES: 3cc7ebf #7234 built-in VimL expression parser 6a7c904 #4419 implement <Cmd> key to invoke command in any mode b836328 #7679 'startup: treat stdin as text instead of commands' 58b210e :digraphs : highlight with hl-SpecialKey #2690 7a13611 #8276 'startup: Let `-s -` read from stdin' 1e71978 events: VimSuspend, VimResume #8280 1e7d5e8 #6272 'stdpath()' f96d99a #8247 server: introduce --listen e8c39f7 #8226 insert-mode: interpret unmapped META as ESC 98e7112 msg: do not scroll entire screen (#8088) f72630b #8055 let negative 'writedelay' show all redraws 5d2dd2e win: has("wsl") on Windows Subsystem for Linux #7330 a4f6cec cmdline: CmdlineEnter and CmdlineLeave autocommands (#7422) 207b7ca #6844 channels: support buffered output and bytes sockets/stdio API: f85cbea #7917 API: buffer updates 418abfc #6743 API: list information about all channels/jobs. 36b2e3f #8375 API: nvim_get_commands 273d2cd #8329 API: Make nvim_set_option() update `:verbose set …` 8d40b36 #8371 API: more reliable/descriptive VimL errors ebb1acb #8353 API: nvim_call_dict_function 9f994bb #8004 API: nvim_list_uis 3405704 #7520 API/UI: forward option updates to UIs 911b1e4 #7821 API: improve nvim_command_output WINDOWS OS: 9cefd83 #8084, #8516 build/win: support MSVC ee4e1fd win: Fix reading content from stdin (#8267) TUI: ffb8904 #8309 TUI: add support for mouse release events in urxvt 8d5a46e #8081 TUI: implement "standout" attribute 6071637 TUI: support TERM=konsole-256color 67848c0 #7653 TUI: report TUI info with -V3 ('verbose' >= 3) 3d0ee17 TUI/rxvt: enable focus-reporting d109f56 #7640 TUI: 'term' option: reflect effective terminal behavior FIXES: ed6a113 #8273 'job-control: avoid kill-timer race' 4e02f1a #8107 'jobs: separate process-group' 451c48a terminal: flush vterm output buffer on pty output #8486 5d6732f :checkhealth fixes #8335 53f11dc #8218 'Fix errors reported by PVS' d05712f inccommand: pause :terminal redraws (#8307) 51af911 inccommand: do not execute trailing commands #8256 84359a4 terminal: resize to the max dimensions (#8249) d49c1dd #8228 Make vim_fgets() return the same values as in Vim 60e96a4 screen: winhl=Normal:Background should not override syntax (#8093) 0c59ac1 #5908 'shada: Also save numbered marks' ba87a2c cscope: ignore EINTR while reading the prompt (#8079) b1412dc #7971 ':terminal Enter/Leave should not increment jumplist' 3a5721e TUI: libtermkey: force CSI driver for mouse input #7948 6ff13d7 #7720 TUI: faster startup 1c6e956 #7862 TUI: fix resize-related segfaults a58c909 #7676 TUI: always hide cursor when flushing, never flush buffers during unibilium output 303e1df #7624 TUI: disable BCE almost always 249bdb0 #7761 mark: Make sure that jumplist item will not have zero lnum 6f41ce0 #7704 macOS: Set $LANG based on the system locale a043899 #7633 'Retry fgets on EINTR' CHANGES: ad60927 #8304 default to 'nofsync' f3f1970 #8035 defaults: 'fillchars' a6052c7 #7984 defaults: sidescroll=1 b69fa86 #7888 defaults: enable cscopeverbose 7c4bb23 defaults: do :filetype stuff unless explicitly "off" 2aa308c #5658 'Apply :lmap in macros' 8ce6393 terminal: Leave 'relativenumber' alone (#8360) e46534b #4486 refactor: Remove maxmem, maxmemtot options 131aad9 win: defaults: 'shellcmdflag', 'shellxquote' #7343 c57d315 #8031 jobwait(): return -2 on interrupt also with timeout 6452831 clipboard: macOS: fallback to tmux if pbcopy is broken #7940 300d365 #7919 Make 'langnoremap' apply directly after a map ada1956 #7880 'lua/executor: Remove lightuserdata' INTERNAL: de0a954 #7806 internal statistics for list impl dee78a4 #7708 rewrite internal list impl
Wrapping a command in double quotes allows cmd.exe to safely dequote
the entire command as if the user entered the entire command in an interactive prompt.
This reduces the need to escape nested and uneven double quotes.
makes this behaviour consistent.
Use case for this using cygwin's echo.exe to compare with cmd.exe's internal echo command.
Without this patch, cmd.exe cannot use echo.exe even if it is wrapped in double quotes.
Example: