diff options
| author | Scott Prager <splinterofchaos@gmail.com> | 2015-05-03 09:25:53 -0400 |
|---|---|---|
| committer | Scott Prager <splinterofchaos@gmail.com> | 2015-05-29 13:12:12 -0400 |
| commit | 412d246be71bd99cb4edde4e6f984b0b0d91bcd9 (patch) | |
| tree | 01307051583b9cf2faf56778a9bd88e00d2a2122 /src/nvim/main.c | |
| parent | fa0f1222212704c93ab828b876bda5e9e1cb507e (diff) | |
| download | rneovim-412d246be71bd99cb4edde4e6f984b0b0d91bcd9.tar.gz rneovim-412d246be71bd99cb4edde4e6f984b0b0d91bcd9.tar.bz2 rneovim-412d246be71bd99cb4edde4e6f984b0b0d91bcd9.zip | |
getenv: return NULL if empty #2574
Making an environment variable empty can be a way of unsetting it for
platforms that don't support unsetenv(). In most cases, we treat empty
variables as having been unset. For all others, use os_env_exists().
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index fc72039b5f..ddc39caa6f 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1889,8 +1889,8 @@ static void main_start_gui(void) /// OK otherwise. static int process_env(char *env, bool is_viminit) { - char *initstr = (char *)os_getenv(env); - if (initstr != NULL && *initstr != NUL) { + const char *initstr = os_getenv(env); + if (initstr != NULL) { if (is_viminit) { vimrc_found(NULL, NULL); } @@ -1900,7 +1900,7 @@ static int process_env(char *env, bool is_viminit) sourcing_lnum = 0; scid_T save_sid = current_SID; current_SID = SID_ENV; - do_cmdline_cmd(initstr); + do_cmdline_cmd((char *)initstr); sourcing_name = save_sourcing_name; sourcing_lnum = save_sourcing_lnum; current_SID = save_sid;; |