aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/os/env.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-02-02 13:16:15 +0100
committerJustin M. Keyes <justinkz@gmail.com>2017-02-04 11:07:49 +0100
commit224f99b85d311ebd31451db13b66e4a3c7e51938 (patch)
treede2bb4bc8f06e09ede603ae535697384133a4ed5 /src/nvim/os/env.c
parent7d58aba80c6d81a9af40f54e566c0cdcea2de3e3 (diff)
downloadrneovim-224f99b85d311ebd31451db13b66e4a3c7e51938.tar.gz
rneovim-224f99b85d311ebd31451db13b66e4a3c7e51938.tar.bz2
rneovim-224f99b85d311ebd31451db13b66e4a3c7e51938.zip
win: Append process dir to $PATH
This allows executables to be found by :!, system(), and executable() if they live next to ("sibling" to) nvim.exe. This is what gvim on Windows does, and also matches the behavior of Win32 SearchPath(). https://github.com/vim/vim/blob/c4a249a736d40ec54794827ef95804c225d0e38f/src/os_win32.c#L354-L370
Diffstat (limited to 'src/nvim/os/env.c')
-rw-r--r--src/nvim/os/env.c40
1 files changed, 40 insertions, 0 deletions
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 747a34d8ce..4707b0a326 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -831,3 +831,43 @@ char_u *get_env_name(expand_T *xp, int idx)
return NULL;
}
+/// Appends the head of `fname` to $PATH and sets it in the environment.
+///
+/// @param fname Full path whose parent directory will be appended to $PATH.
+///
+/// @return true if `path` was appended-to
+bool os_setenv_append_path(const char *fname)
+ FUNC_ATTR_NONNULL_ALL
+{
+#ifdef WIN32
+// 8191 (plus NUL) is considered the practical maximum.
+# define MAX_ENVPATHLEN 8192
+#else
+// No prescribed maximum on unix.
+# define MAX_ENVPATHLEN INT_MAX
+#endif
+ if (!path_is_absolute_path((char_u *)fname)) {
+ EMSG2(_(e_intern2), "os_setenv_append_path()");
+ return false;
+ }
+ const char *tail = (char *)path_tail_with_sep((char_u *)fname);
+ const char *dir = (char *)vim_strnsave((char_u *)fname,
+ (size_t)(tail - fname));
+ const char *path = os_getenv("PATH");
+ const size_t pathlen = path ? strlen(path) : 0;
+ const size_t newlen = pathlen + strlen(dir) + 2;
+ if (newlen < MAX_ENVPATHLEN) {
+ char *temp = xmalloc(newlen);
+ if (pathlen == 0) {
+ temp[0] = NUL;
+ } else {
+ xstrlcpy(temp, path, newlen);
+ xstrlcat(temp, ENV_SEPSTR, newlen);
+ }
+ xstrlcat(temp, dir, newlen);
+ os_setenv("PATH", temp, 1);
+ xfree(temp);
+ return true;
+ }
+ return false;
+}