summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-06-21 11:12:49 +0000
committerBram Moolenaar <Bram@vim.org>2008-06-21 11:12:49 +0000
commitbf820723f58c7c788531e2a310d6b57bd2263236 (patch)
tree927f94edbf96a9790217c50e1b47467619dc6d81
parentb64bb6e3a5eece22868943c55034aa6074df0c09 (diff)
updated for version 7.1-328v7.1.328
-rw-r--r--src/os_unix.c7
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c
index 7bad7e9d41..4c3f39f2c7 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -2278,6 +2278,10 @@ mch_FullName(fname, buf, len, force)
char_u olddir[MAXPATHL];
char_u *p;
int retval = OK;
+#ifdef __CYGWIN__
+ char_u posix_fname[MAX_PATH];
+#endif
+
#ifdef VMS
fname = vms_fixfilename(fname);
@@ -2287,7 +2291,8 @@ mch_FullName(fname, buf, len, force)
/*
* This helps for when "/etc/hosts" is a symlink to "c:/something/hosts".
*/
- cygwin_conv_to_posix_path(fname, fname);
+ cygwin_conv_to_posix_path(fname, posix_fname);
+ fname = posix_fname;
#endif
/* expand it if forced or not an absolute path */
diff --git a/src/version.c b/src/version.c
index 516b342c39..bd4a99f5c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 328,
+/**/
327,
/**/
326,