diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-31 22:26:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-31 22:26:28 +0100 |
| commit | 06b0734d9cd2f39d4c12c7fd89a100eadbe5be78 (patch) | |
| tree | 697d2ef930655826c7c4a266a38fac6f8fc31c9b | |
| parent | 9b05a0d0f94d8c4c1ddd51e7f31b73f7556bdbdc (diff) | |
patch 7.4.1014v7.4.1014
Problem: fnamemodify('.', ':.') returns an empty string in Cygwin.
Solution: Use CCP_RELATIVE in the call to cygwin_conv_path. (Jacob Niehus,
closes #505)
| -rw-r--r-- | src/os_unix.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 89519fad2a..d4a0f6dbe8 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2464,7 +2464,10 @@ mch_FullName(fname, buf, len, force) * This helps for when "/etc/hosts" is a symlink to "c:/something/hosts". */ # if CYGWIN_VERSION_DLL_MAJOR >= 1007 - cygwin_conv_path(CCP_WIN_A_TO_POSIX, fname, posix_fname, MAXPATHL); + /* Use CCP_RELATIVE to avoid that it sometimes returns a path that ends in + * a forward slash. */ + cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_RELATIVE, + fname, posix_fname, MAXPATHL); # else cygwin_conv_to_posix_path(fname, posix_fname); # endif diff --git a/src/version.c b/src/version.c index f6f0754c64..699a7f6cb3 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1014, +/**/ 1013, /**/ 1012, |