diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-10-02 02:42:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-02 02:42:33 +0200 |
| commit | 01e53a5cbe676181629ef63731b980c453c0bd62 (patch) | |
| tree | 0ee28dd373787791a12a977a2476ae0dd38e3edb /src/nvim/path.c | |
| parent | 981387b7c83026c1446cdddf6b374f63973a2b86 (diff) | |
| parent | 6f7754dfa0c6a9ec2a1e7db3685ffd41b207b882 (diff) | |
| download | rneovim-01e53a5cbe676181629ef63731b980c453c0bd62.tar.gz rneovim-01e53a5cbe676181629ef63731b980c453c0bd62.tar.bz2 rneovim-01e53a5cbe676181629ef63731b980c453c0bd62.zip | |
Merge #7349 'win: more path-handling fixes'
Diffstat (limited to 'src/nvim/path.c')
| -rw-r--r-- | src/nvim/path.c | 10 |
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); |