diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-02-24 20:09:14 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-02-27 23:29:07 +0100 |
commit | 89515304e4eb81ff9eb65f3a582136fc658de139 (patch) | |
tree | 24b445c4aa5588772aa98f830f4646a738727810 /src/nvim/main.c | |
parent | 1d8e7683604828592bd41cdac5a351145cd93487 (diff) | |
download | rneovim-89515304e4eb81ff9eb65f3a582136fc658de139.tar.gz rneovim-89515304e4eb81ff9eb65f3a582136fc658de139.tar.bz2 rneovim-89515304e4eb81ff9eb65f3a582136fc658de139.zip |
os/env: use libuv v1.12 getenv/setenv API
- Minimum required libuv is now v1.12
- Because `uv_os_getenv` requires allocating, we must manage a map
(`envmap` in `env.c`) to maintain the old behavior of `os_getenv` .
- free() map-items after removal. khash.h does not make copies of
anything, so even its keys must be memory-managed by the caller.
closes #8398
closes #9267
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r-- | src/nvim/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index 251a54ad5b..79513b1c21 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -184,6 +184,7 @@ bool event_teardown(void) void early_init(void) { log_init(); + env_init(); fs_init(); handle_init(); eval_init(); // init global variables @@ -1769,7 +1770,7 @@ static bool do_user_initialization(void) FUNC_ATTR_WARN_UNUSED_RESULT { bool do_exrc = p_exrc; - if (process_env("VIMINIT") == OK) { + if (execute_env("VIMINIT") == OK) { do_exrc = p_exrc; return do_exrc; } @@ -1814,7 +1815,7 @@ static bool do_user_initialization(void) } while (iter != NULL); xfree(config_dirs); } - if (process_env("EXINIT") == OK) { + if (execute_env("EXINIT") == OK) { do_exrc = p_exrc; return do_exrc; } @@ -1878,7 +1879,7 @@ static void source_startup_scripts(const mparm_T *const parmp) /// /// @return FAIL if the environment variable was not executed, /// OK otherwise. -static int process_env(char *env) +static int execute_env(char *env) FUNC_ATTR_NONNULL_ALL { const char *initstr = os_getenv(env); |