aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgnas Anikevicius <anikevicius@gmail.com>2017-09-18 21:06:55 +0300
committerJustin M. Keyes <justinkz@gmail.com>2017-10-02 00:48:30 +0200
commit2b133101cf67b523c2503ef715dfb9ebfa732da2 (patch)
tree3955290491608369498a6821d070d6d711248da2 /src
parent981387b7c83026c1446cdddf6b374f63973a2b86 (diff)
downloadrneovim-2b133101cf67b523c2503ef715dfb9ebfa732da2.tar.gz
rneovim-2b133101cf67b523c2503ef715dfb9ebfa732da2.tar.bz2
rneovim-2b133101cf67b523c2503ef715dfb9ebfa732da2.zip
win: vim_FullName(): force backslashes #7287
- Replace obvious cases of '/' literal with PATHSEP. (There are still some remaining cases that need closer inspection.) - Fixup tests: ui/screen_basic closes #7117 ref https://github.com/neovim/neovim/issues/2471#issuecomment-271193714
Diffstat (limited to 'src')
-rw-r--r--src/nvim/path.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c
index f2339c8046..51adcfb135 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1690,6 +1690,9 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force)
if (strlen(fname) > (len - 1)) {
xstrlcpy(buf, fname, len); // truncate
+#ifdef WIN32
+ slash_adjust(buf);
+#endif
return FAIL;
}
@@ -1702,6 +1705,9 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force)
if (rv == FAIL) {
xstrlcpy(buf, fname, len); // something failed; use the filename
}
+#ifdef WIN32
+ slash_adjust(buf);
+#endif
return rv;
}
@@ -2196,11 +2202,11 @@ static int path_get_absolute_path(const char_u *fname, char_u *buf,
// expand it if forced or not an absolute path
if (force || !path_is_absolute_path(fname)) {
- if ((p = vim_strrchr(fname, '/')) != NULL) {
+ if ((p = vim_strrchr(fname, PATHSEP)) != NULL) {
// relative to root
if (p == fname) {
// only one path component
- relative_directory[0] = '/';
+ relative_directory[0] = PATHSEP;
relative_directory[1] = NUL;
} else {
assert(p >= fname);