Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: builtins.c does not compile under latest cygwin



On Fri, 2 Aug 2013 14:14:26 -0500
Edgar Sánchez Grajeda <edgarsanchezg@xxxxxxxxx> wrote:
> I looked up the missing function, and cygwin_conv_to_posix_path() function
> was deprecated and replaced with cygwin_conv_path().

You probably need something like this.

There doesn't seem any point in trying to fix things up if the header
isn't present in this case since the definitions won't be available.

diff --git a/Src/builtin.c b/Src/builtin.c
index ae2e9f6..3159975 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 5528597..c3debd8 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

-- 
Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/



Messages sorted by: Reverse Date, Date, Thread, Author