vim: src/evalfunc.c comparison

comparison src/evalfunc.c @ 16604:1e0a5f09fdf1 v8.1.1305

patch 8.1.1305: there is no easy way to manipulate environment variables commit https://github.com/vim/vim/commit/691ddeefb545d8488e5a495af61caba2e57b3de9 Author: Bram Moolenaar <Bram@vim.org> Date: Thu May 9 14:52:41 2019 +0200 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 #2875)

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 09 May 2019 15:00:07 +0200
parents	ff3c99bd1038
children	7e733046db1d

comparison

equal deleted inserted replaced

-:83e535d7e403
+:1e0a5f09fdf1
 static void f_deletebufline(typval_T *argvars, typval_T *rettv);
 static void f_did_filetype(typval_T *argvars, typval_T *rettv);
 static void f_diff_filler(typval_T *argvars, typval_T *rettv);
 static void f_diff_hlID(typval_T *argvars, typval_T *rettv);
 static void f_empty(typval_T *argvars, typval_T *rettv);
+static void f_environ(typval_T *argvars, typval_T *rettv);
 static void f_escape(typval_T *argvars, typval_T *rettv);
 static void f_eval(typval_T *argvars, typval_T *rettv);
 static void f_eventhandler(typval_T *argvars, typval_T *rettv);
 static void f_executable(typval_T *argvars, typval_T *rettv);
 static void f_execute(typval_T *argvars, typval_T *rettv);
 #endif
 static void f_getcmdpos(typval_T *argvars, typval_T *rettv);
 static void f_getcmdtype(typval_T *argvars, typval_T *rettv);
 static void f_getcmdwintype(typval_T *argvars, typval_T *rettv);
 static void f_getcwd(typval_T *argvars, typval_T *rettv);
+static void f_getenv(typval_T *argvars, typval_T *rettv);
 static void f_getfontname(typval_T *argvars, typval_T *rettv);
 static void f_getfperm(typval_T *argvars, typval_T *rettv);
 static void f_getfsize(typval_T *argvars, typval_T *rettv);
 static void f_getftime(typval_T *argvars, typval_T *rettv);
 static void f_getftype(typval_T *argvars, typval_T *rettv);
 static void f_serverlist(typval_T *argvars, typval_T *rettv);
 static void f_setbufline(typval_T *argvars, typval_T *rettv);
 static void f_setbufvar(typval_T *argvars, typval_T *rettv);
 static void f_setcharsearch(typval_T *argvars, typval_T *rettv);
 static void f_setcmdpos(typval_T *argvars, typval_T *rettv);
+static void f_setenv(typval_T *argvars, typval_T *rettv);
 static void f_setfperm(typval_T *argvars, typval_T *rettv);
 static void f_setline(typval_T *argvars, typval_T *rettv);
 static void f_setloclist(typval_T *argvars, typval_T *rettv);
 static void f_setmatches(typval_T *argvars, typval_T *rettv);
 static void f_setpos(typval_T *argvars, typval_T *rettv);
 {"deletebufline",	2, 3, f_deletebufline},
 {"did_filetype",	0, 0, f_did_filetype},
 {"diff_filler",	1, 1, f_diff_filler},
 {"diff_hlID",	2, 2, f_diff_hlID},
 {"empty",		1, 1, f_empty},
+{"environ",		0, 0, f_environ},
 {"escape",		2, 2, f_escape},
 {"eval",		1, 1, f_eval},
 {"eventhandler",	0, 0, f_eventhandler},
 {"executable",	1, 1, f_executable},
 {"execute",		1, 2, f_execute},
 #if defined(FEAT_CMDL_COMPL)
 {"getcompletion",	2, 3, f_getcompletion},
 #endif
 {"getcurpos",	0, 0, f_getcurpos},
 {"getcwd",		0, 2, f_getcwd},
+{"getenv",		1, 1, f_getenv},
 {"getfontname",	0, 1, f_getfontname},
 {"getfperm",	1, 1, f_getfperm},
 {"getfsize",	1, 1, f_getfsize},
 {"getftime",	1, 1, f_getftime},
 {"getftype",	1, 1, f_getftype},
 {"serverlist",	0, 0, f_serverlist},
 {"setbufline",	3, 3, f_setbufline},
 {"setbufvar",	3, 3, f_setbufvar},
 {"setcharsearch",	1, 1, f_setcharsearch},
 {"setcmdpos",	1, 1, f_setcmdpos},
+{"setenv",		2, 2, f_setenv},
 {"setfperm",	2, 2, f_setfperm},
 {"setline",		2, 2, f_setline},
 {"setloclist",	2, 4, f_setloclist},
 {"setmatches",	1, 2, f_setmatches},
 {"setpos",		2, 2, f_setpos},
 	    n = TRUE;
 	    break;
 }
 rettv->vval.v_number = n;
+}
+/*
+* "environ()" function
+*/
+static void
+f_environ(typval_T *argvars UNUSED, typval_T *rettv)
+{
+#if !defined(AMIGA)
+int			i = 0;
+char_u		*entry, *value;
+# ifdef MSWIN
+extern wchar_t	**_wenviron;
+# else
+extern char		**environ;
+# endif
+if (rettv_dict_alloc(rettv) != OK)
+	return;
+# ifdef MSWIN
+if (*_wenviron == NULL)
+	return;
+# else
+if (*environ == NULL)
+	return;
+# endif
+for (i = 0; ; ++i)
+{
+# ifdef MSWIN
+	short_u		*p;
+	if ((p = (short_u *)_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 (entry == NULL) // out of memory
+	    return;
+	if ((value = vim_strchr(entry, '=')) == NULL)
+	{
+	    vim_free(entry);
+	    continue;
+	}
+	*value++ = NUL;
+	dict_add_string(rettv->vval.v_dict, (char *)entry, value);
+	vim_free(entry);
+}
+#endif
 }
 /*
 * "escape({string}, {chars})" function
 */
 }
 #ifdef BACKSLASH_IN_FILENAME
 if (rettv->vval.v_string != NULL)
 	slash_adjust(rettv->vval.v_string);
 #endif
+}
+/*
+* "getenv()" function
+*/
+static void
+f_getenv(typval_T *argvars, typval_T *rettv)
+{
+int	    mustfree = FALSE;
+char_u  *p = vim_getenv(tv_get_string(&argvars[0]), &mustfree);
+if (p == NULL)
+{
+	rettv->v_type = VAR_SPECIAL;
+	rettv->vval.v_number = VVAL_NULL;
+	return;
+}
+if (!mustfree)
+	p = vim_strsave(p);
+rettv->vval.v_string = p;
+rettv->v_type = VAR_STRING;
 }
 /*
 * "getfontname()" function
 */
 if (pos >= 0)
 	rettv->vval.v_number = set_cmdline_pos(pos);
 }
 /*
+* "setenv()" function
+*/
+static void
+f_setenv(typval_T *argvars, typval_T *rettv UNUSED)
+{
+char_u   namebuf[NUMBUFLEN];
+char_u   valbuf[NUMBUFLEN];
+char_u  *name = tv_get_string_buf(&argvars[0], namebuf);
+if (argvars[1].v_type == VAR_SPECIAL
+				      && argvars[1].vval.v_number == VVAL_NULL)
+	vim_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)
 {

Mercurial > vim

comparison src/evalfunc.c @ 16604:1e0a5f09fdf1 v8.1.1305