From fd66ad226221a22f223dcfca337e893d0a9cca46 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 30 Jul 2019 08:00:36 +0200
Subject: vim-patch:8.1.1305: there is no easy way to manipulate environment
 variables

Problem:    There is no easy way to manipulate environment variables.
Solution:   Add environ(), getenv() and setenv(). (Yasuhiro Matsumoto,
            closes vim/vim#2875)
https://github.com/vim/vim/commit/691ddeefb545d8488e5a495af61caba2e57b3de9
---
 src/nvim/eval.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

(limited to 'src/nvim/eval.c')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d82a081c27..91c82a393e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -8495,6 +8495,54 @@ static void f_empty(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   rettv->vval.v_number = n;
 }
 
+/// "environ()" function
+static void f_environ(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  int i = 0;
+  char_u *entry, *value;
+# ifdef WIN32
+  extern wchar_t **_wenviron;
+# else
+  extern char **environ;
+# endif
+
+  tv_dict_alloc_ret(rettv);
+
+# ifdef WIN32
+  if (*_wenviron == NULL) {
+    return;
+  }
+# else
+  if (*environ == NULL) {
+    return;
+  }
+# endif
+
+  for (i = 0; ; i++) {
+# ifdef WIN32
+    uint16_t *p;
+
+    if ((p = (uint16_t *)_wenviron[i]) == NULL) {
+      return;
+    }
+    entry = utf16_to_enc(p, NULL);
+# else
+    if ((entry = (char_u *)environ[i]) == NULL) {
+      return;
+    }
+    entry = vim_strsave(entry);
+# endif
+    if ((value = vim_strchr(entry, '=')) == NULL) {
+      xfree(entry);
+      continue;
+    }
+    *value++ = NUL;
+    tv_dict_add_str(rettv->vval.v_dict, (char *)entry, STRLEN((char *)entry),
+                    (const char *)value);
+    xfree(entry);
+  }
+}
+
 /*
  * "escape({string}, {chars})" function
  */
@@ -8508,6 +8556,21 @@ static void f_escape(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   rettv->v_type = VAR_STRING;
 }
 
+/// "getenv()" function
+static void f_getenv(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  char_u *p = (char_u *)vim_getenv(tv_get_string(&argvars[0]));
+
+  if (p == NULL || *p == NUL) {
+    rettv->v_type = VAR_SPECIAL;
+    rettv->vval.v_number = kSpecialVarNull;
+    return;
+  }
+  p = vim_strsave(p);
+  rettv->vval.v_string = p;
+  rettv->v_type = VAR_STRING;
+}
+
 /*
  * "eval()" function
  */
@@ -15319,6 +15382,20 @@ static void f_setcmdpos(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   }
 }
 
+/// "setenv()" function
+static void f_setenv(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  char namebuf[NUMBUFLEN];
+  char valbuf[NUMBUFLEN];
+  const char *name = tv_get_string_buf(&argvars[0], namebuf);
+
+  if (argvars[1].v_type == VAR_SPECIAL
+      && argvars[1].vval.v_number == kSpecialVarNull) {
+    os_unsetenv(name);
+  } else {
+    vim_setenv(name, tv_get_string_buf(&argvars[1], valbuf));
+  }
+}
 
 /// "setfperm({fname}, {mode})" function
 static void f_setfperm(typval_T *argvars, typval_T *rettv, FunPtr fptr)
-- 
cgit 


From d55b12ea508500760796ede2bca9b48f391afb80 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Tue, 30 Jul 2019 11:55:55 +0200
Subject: f_environ: cleanup/refactor

- use os_getenvname_at_index / os_getenv
- f_getenv: empty (*p == NUL) is not null (undefined)
---
 src/nvim/eval.c | 52 +++++++++++-----------------------------------------
 1 file changed, 11 insertions(+), 41 deletions(-)

(limited to 'src/nvim/eval.c')

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 91c82a393e..7ffa59f298 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -8498,48 +8498,19 @@ static void f_empty(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 /// "environ()" function
 static void f_environ(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  int i = 0;
-  char_u *entry, *value;
-# ifdef WIN32
-  extern wchar_t **_wenviron;
-# else
-  extern char **environ;
-# endif
-
   tv_dict_alloc_ret(rettv);
 
-# ifdef WIN32
-  if (*_wenviron == NULL) {
-    return;
-  }
-# else
-  if (*environ == NULL) {
-    return;
-  }
-# endif
-
-  for (i = 0; ; i++) {
-# ifdef WIN32
-    uint16_t *p;
-
-    if ((p = (uint16_t *)_wenviron[i]) == NULL) {
-      return;
-    }
-    entry = utf16_to_enc(p, NULL);
-# else
-    if ((entry = (char_u *)environ[i]) == NULL) {
-      return;
-    }
-    entry = vim_strsave(entry);
-# endif
-    if ((value = vim_strchr(entry, '=')) == NULL) {
-      xfree(entry);
-      continue;
+  for (int i = 0; ; i++) {
+    // TODO(justinmk): use os_copyfullenv from #7202 ?
+    char *envname = os_getenvname_at_index((size_t)i);
+    if (envname == NULL) {
+      break;
     }
-    *value++ = NUL;
-    tv_dict_add_str(rettv->vval.v_dict, (char *)entry, STRLEN((char *)entry),
-                    (const char *)value);
-    xfree(entry);
+    const char *value = os_getenv(envname);
+    tv_dict_add_str(rettv->vval.v_dict,
+                    (char *)envname, STRLEN((char *)envname),
+                    value == NULL ? "" : value);
+    xfree(envname);
   }
 }
 
@@ -8561,12 +8532,11 @@ static void f_getenv(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u *p = (char_u *)vim_getenv(tv_get_string(&argvars[0]));
 
-  if (p == NULL || *p == NUL) {
+  if (p == NULL) {
     rettv->v_type = VAR_SPECIAL;
     rettv->vval.v_number = kSpecialVarNull;
     return;
   }
-  p = vim_strsave(p);
   rettv->vval.v_string = p;
   rettv->v_type = VAR_STRING;
 }
-- 
cgit