diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-07-31 01:17:24 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2021-01-31 07:54:20 -0500 |
| commit | 7f50c692685c92d47e6ba6c3ee5f6fdccb78fec5 (patch) | |
| tree | 2d1eda8d6437d4d339c244681fdb5b7ff5418c21 /src/nvim/event | |
| parent | 55add1c1c8a9a040f02a880096ca153f7db3e501 (diff) | |
| download | rneovim-7f50c692685c92d47e6ba6c3ee5f6fdccb78fec5.tar.gz rneovim-7f50c692685c92d47e6ba6c3ee5f6fdccb78fec5.tar.bz2 rneovim-7f50c692685c92d47e6ba6c3ee5f6fdccb78fec5.zip | |
Use dict_T to pass env vars to process spawning code
Co-authored-by: Matthieu Coudron <mattator@gmail.com>
Diffstat (limited to 'src/nvim/event')
| -rw-r--r-- | src/nvim/event/libuv_process.c | 7 | ||||
| -rw-r--r-- | src/nvim/event/process.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c index 13517d3df1..72e45878f6 100644 --- a/src/nvim/event/libuv_process.c +++ b/src/nvim/event/libuv_process.c @@ -41,7 +41,6 @@ int libuv_process_spawn(LibuvProcess *uvproc) #endif uvproc->uvopts.exit_cb = exit_cb; uvproc->uvopts.cwd = proc->cwd; - uvproc->uvopts.env = proc->env; uvproc->uvopts.stdio = uvproc->uvstdio; uvproc->uvopts.stdio_count = 3; uvproc->uvstdio[0].flags = UV_IGNORE; @@ -49,6 +48,12 @@ int libuv_process_spawn(LibuvProcess *uvproc) uvproc->uvstdio[2].flags = UV_IGNORE; uvproc->uv.data = proc; + if (proc->env) { + uvproc->uvopts.env = tv_dict_to_env(proc->env); + } else { + uvproc->uvopts.env = NULL; + } + if (!proc->in.closed) { uvproc->uvstdio[0].flags = UV_CREATE_PIPE | UV_READABLE_PIPE; #ifdef WIN32 diff --git a/src/nvim/event/process.h b/src/nvim/event/process.h index 84e81238e9..24debdb276 100644 --- a/src/nvim/event/process.h +++ b/src/nvim/event/process.h @@ -4,6 +4,7 @@ #include "nvim/event/loop.h" #include "nvim/event/rstream.h" #include "nvim/event/wstream.h" +#include "nvim/eval/typval.h" typedef enum { kProcessTypeUv, @@ -23,7 +24,7 @@ struct process { uint64_t stopped_time; // process_stop() timestamp const char *cwd; char **argv; - char **env; + dict_T *env; Stream in, out, err; process_exit_cb cb; internal_process_cb internal_exit_cb, internal_close_cb; |