aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Abreu Ferreira <raf-ep@gmx.com>2015-05-12 16:08:38 +0100
committerSeth Jackson <sethjackson@gmail.com>2016-01-11 16:36:13 -0500
commit7c0f6d2380c11a5a2c1fee74f846a32e29ec1ba0 (patch)
tree07588f075bed7163e96e811147ce4a229acd114f
parent3b94756feb39ad269104b2f765c6c56ff2360203 (diff)
downloadrneovim-7c0f6d2380c11a5a2c1fee74f846a32e29ec1ba0.tar.gz
rneovim-7c0f6d2380c11a5a2c1fee74f846a32e29ec1ba0.tar.bz2
rneovim-7c0f6d2380c11a5a2c1fee74f846a32e29ec1ba0.zip
Windows: use ';' as env $PATH separator.
In Windows the separator character in the PATH environment is ';' instead of ':'. Add a new define ENV_SEPCHAR to be used instead of hardcoding the character literal.
-rw-r--r--src/nvim/os/fs.c4
-rw-r--r--src/nvim/os/unix_defs.h3
-rw-r--r--src/nvim/os/win_defs.h3
3 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 1a4c3495f2..21f0fc6f41 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -151,7 +151,7 @@ static bool is_executable_in_path(const char_u *name, char_u **abspath)
// Walk through all entries in $PATH to check if "name" exists there and
// is an executable file.
for (;; ) {
- const char *e = xstrchrnul(path, ':');
+ const char *e = xstrchrnul(path, ENV_SEPCHAR);
// Glue together the given directory from $PATH with name and save into
// buf.
@@ -169,7 +169,7 @@ static bool is_executable_in_path(const char_u *name, char_u **abspath)
return true;
}
- if (*e != ':') {
+ if (*e != ENV_SEPCHAR) {
// End of $PATH without finding any executable called name.
xfree(buf);
return false;
diff --git a/src/nvim/os/unix_defs.h b/src/nvim/os/unix_defs.h
index e3ba3262f4..4af468f8d9 100644
--- a/src/nvim/os/unix_defs.h
+++ b/src/nvim/os/unix_defs.h
@@ -17,4 +17,7 @@
// Special wildcards that need to be handled by the shell.
#define SPECIAL_WILDCHAR "`'{"
+// Separator character for environment variables.
+#define ENV_SEPCHAR ':'
+
#endif // NVIM_OS_UNIX_DEFS_H
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h
index 9f9e5e277c..698f41b3ca 100644
--- a/src/nvim/os/win_defs.h
+++ b/src/nvim/os/win_defs.h
@@ -10,6 +10,9 @@
#define FNAME_ILLEGAL "\"*?><|"
+// Separator character for environment variables.
+#define ENV_SEPCHAR ';'
+
#define USE_CRNL
#ifdef _MSC_VER