Add support for the forthcoming Cygwin 1.7.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32616 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index bd84776e76d65ead4ee5d07b4759148962d23032..2f6b9b4b5740ae79a88746afaf6b37fb7d5a47ca 100644 (file)
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -29,8 +29,11 @@
 #include <limits.h>
 #include <stdlib.h>
 
+#include <cygwin/version.h>
 #include <sys/cygwin.h>
 
+#include <ostream>
+
 using namespace std;
 
 namespace lyx {
@@ -62,6 +65,63 @@ bool is_windows_path(string const & p)
 }
 
 
+// Starting from Cygwin 1.7, new APIs for path conversions were introduced.
+// The old ones are now deprecated, so avoid them if we detect a modern Cygwin.
+
+#if CYGWIN_VERSION_DLL_MAJOR >= 1007
+
+enum PathStyle {
+       posix = CCP_WIN_A_TO_POSIX | CCP_RELATIVE,
+       windows = CCP_POSIX_TO_WIN_A | CCP_RELATIVE
+};
+
+
+/// Convert a path to or from posix style.
+/// \p p is encoded in local 8bit encoding or utf8.
+/// The result is returned in the same encoding as \p p.
+string convert_path(string const & p, PathStyle const & target)
+{
+       if ((target == posix && is_posix_path(p)) ||
+           (target == windows && is_windows_path(p)))
+               return p;
+
+       char path_buf[PATH_MAX];
+
+       // cygwin_conv_path does not care about the encoding.
+       if (cygwin_conv_path(target, p.c_str(), path_buf, sizeof(path_buf))) {
+               lyxerr << "LyX: Cannot convert path: " << p << endl;
+               return subst(p, '\\', '/');
+       }
+       return subst(path_buf, '\\', '/');
+}
+
+
+/// Convert a path list to or from posix style.
+/// \p p is encoded in local 8bit encoding or utf8.
+/// The result is returned in the same encoding as \p p.
+string convert_path_list(string const & p, PathStyle const & target)
+{
+       if (p.empty())
+               return p;
+
+       char const * const pc = p.c_str();
+       PathStyle const actual = cygwin_posix_path_list_p(pc) ? posix : windows;
+
+       if (target != actual) {
+               int const size = cygwin_conv_path_list(target, pc, NULL, 0);
+               char * ptr = new char[size];
+               if (ptr && cygwin_conv_path_list(target, pc, ptr, size) == 0) {
+                       string const path_list = subst(ptr, '\\', '/');
+                       delete ptr;
+                       return path_list;
+               } else
+                       lyxerr << "LyX: Cannot convert path list: " << p << endl;
+       }
+       return subst(p, '\\', '/');
+}
+
+#else
+
 enum PathStyle {
        posix,
        windows
@@ -126,6 +186,8 @@ string convert_path_list(string const & p, PathStyle const & target)
        return subst(p, '\\', '/');
 }
 
+#endif
+
 
 BOOL terminate_handler(DWORD event)
 {