mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

os_system(): do not set up input stream for empty string #7951

Browse Source 
Test failure:
test/functional/eval/system_spec.lua: "works with an empty string"
E5677: Error writing input to shell-command: EPIPE

ref https://github.com/neovim/neovim/pull/6558#issuecomment-361061035
ref #6554
This commit is contained in:
Justin M. Keyes
2018-01-31 10:25:51 +01:00
parent ec7cbabf01
commit 648fed975e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/os/shell.c
View File

@@ -189,6 +189,7 @@ static int do_os_system(char **argv,
{ {
out_data_decide_throttle(0); // Initialize throttle decider. out_data_decide_throttle(0); // Initialize throttle decider.
out_data_ring(NULL, 0); // Initialize output ring-buffer. out_data_ring(NULL, 0); // Initialize output ring-buffer.
bool has_input = (input != NULL && input[0] != '\0');
// the output buffer // the output buffer
DynamicBuffer buf = DYNAMIC_BUFFER_INIT; DynamicBuffer buf = DYNAMIC_BUFFER_INIT;
@@ -212,7 +213,7 @@ static int do_os_system(char **argv,
MultiQueue *events = multiqueue_new_child(main_loop.events); MultiQueue *events = multiqueue_new_child(main_loop.events);
proc->events = events; proc->events = events;
proc->argv = argv; proc->argv = argv;
int status = process_spawn(proc, input != NULL, true, true); int status = process_spawn(proc, has_input, true, true);
if (status) { if (status) {
loop_poll_events(&main_loop, 0); loop_poll_events(&main_loop, 0);
// Failed, probably 'shell' is not executable. // Failed, probably 'shell' is not executable.
@@ -231,7 +232,7 @@ static int do_os_system(char **argv,
// deal with stream events as fast a possible. It prevents closing the // deal with stream events as fast a possible. It prevents closing the
// streams while there's still data in the OS buffer (due to the process // streams while there's still data in the OS buffer (due to the process
// exiting before all data is read). // exiting before all data is read).
if (input != NULL) { if (has_input) {
wstream_init(&proc->in, 0); wstream_init(&proc->in, 0);
} }
rstream_init(&proc->out, 0); rstream_init(&proc->out, 0);
@@ -240,8 +241,8 @@ static int do_os_system(char **argv,
rstream_start(&proc->err, data_cb, &buf); rstream_start(&proc->err, data_cb, &buf);
// write the input, if any // write the input, if any
if (input) { if (has_input) {
WBuffer *input_buffer = wstream_new_buffer((char *) input, len, 1, NULL); WBuffer *input_buffer = wstream_new_buffer((char *)input, len, 1, NULL);
if (!wstream_write(&proc->in, input_buffer)) { if (!wstream_write(&proc->in, input_buffer)) {
// couldn't write, stop the process and tell the user about it // couldn't write, stop the process and tell the user about it

1
test/functional/eval/system_spec.lua
View File

@@ -260,6 +260,7 @@ describe('system()', function()
end) end)
it('works with an empty string', function() it('works with an empty string', function()
eq("test\n", eval('system("echo test", "")')) eq("test\n", eval('system("echo test", "")'))
eq(2, eval("1+1")) -- Still alive?
end) end)
end) end)