summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/builtin.c5
-rw-r--r--configure.ac3
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 21c0cef7c..b6ff9fcef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-05 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * 31631: configure.ac, Src/builtin.c: use cygwin_conv_path in
+ preference to cygwin_conv_to_posix_path if available.
+
2013-08-04 Peter Stephenson <p.w.stephenson@ntlworld.com>
* Yuusuke Yoshimoto: 31632: Completion/Unix/Type/_java_class:
diff --git a/Src/builtin.c b/Src/builtin.c
index ae2e9f676..3159975e3 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -939,11 +939,16 @@ cd_do_chdir(char *cnam, char *dest, int hard)
* DOS style names with drives in them
*/
static char buf[PATH_MAX];
+#ifdef HAVE_CYGWIN_CONV_PATH
+ cygwin_conv_path(CCP_WIN_A_TO_POSIX | CCP_RELATIVE, dest, buf,
+ PATH_MAX);
+#else
#ifndef _SYS_CYGWIN_H
void cygwin_conv_to_posix_path(const char *, char *);
#endif
cygwin_conv_to_posix_path(dest, buf);
+#endif
dest = buf;
#endif
nocdpath = dest[0] == '.' &&
diff --git a/configure.ac b/configure.ac
index 5528597ba..c3debd8ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1237,7 +1237,8 @@ AC_CHECK_FUNCS(strftime strptime mktime timelocal \
regcomp regexec regerror regfree \
gdbm_open getxattr \
realpath canonicalize_file_name \
- symlink getcwd)
+ symlink getcwd \
+ cygwin_conv_path)
AC_FUNC_STRCOLL
if test x$enable_cap = xyes; then