diff options
| author | Joachim Lingner <jl@openoffice.org> | 2011-02-24 15:28:48 +0100 |
|---|---|---|
| committer | Joachim Lingner <jl@openoffice.org> | 2011-02-24 15:28:48 +0100 |
| commit | 471f8022c9c800a1428bdcae110fe4152db351b1 (patch) | |
| tree | 3d571628274f7291d91b55a6c0ef8bea755c6d85 | |
| parent | 85fb928fef14ff3fac6631ba297a6fc9bced5b61 (diff) | |
jl164 #i109096# libxml2 fails when using long paths on windows
| -rw-r--r-- | libxml2/libxml2-long-path.patch | 34 | ||||
| -rwxr-xr-x[-rw-r--r--] | libxml2/makefile.mk | 3 |
2 files changed, 37 insertions, 0 deletions
diff --git a/libxml2/libxml2-long-path.patch b/libxml2/libxml2-long-path.patch new file mode 100644 index 000000000000..bd888d99e183 --- /dev/null +++ b/libxml2/libxml2-long-path.patch @@ -0,0 +1,34 @@ +--- misc/libxml2-2.7.6/uri.c 2009-10-02 17:28:55.000000000 +0200 ++++ misc/build/libxml2-2.7.6/uri.c 2011-02-24 13:47:19.349299000 +0100 +@@ -2479,7 +2479,16 @@ + if (path == NULL) + return(NULL); + +- /* sanitize filename starting with // so it can be used as URI */ ++#if defined(_WIN32) ++ //We must not change the backslashes to slashes if the the path starts with ++ // \\?\ ++ //Those pathes can be up to 32k characters long. ++ len = xmlStrlen(path); ++ if ((len > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) ++ return xmlStrdup((const xmlChar *) path); ++#endif ++ ++ /* sanitize filename starting with // so it can be used as URI */ + if ((path[0] == '/') && (path[1] == '/') && (path[2] != '/')) + path++; + +--- misc/libxml2-2.7.6/xmlIO.c 2009-09-24 17:32:00.000000000 +0200 ++++ misc/build/libxml2-2.7.6/xmlIO.c 2011-02-24 13:47:26.163762000 +0100 +@@ -772,6 +772,11 @@ + + #ifdef HAVE_STAT + #if defined(_WIN32) || defined (__DJGPP__) && !defined (__CYGWIN__) ++ //On Windows stat and wstat do not work with long pathname, ++ //which start with '\\?\' ++ if ((xmlStrlen(path) > 3) && (path[0] == '\\') && (path[1] == '\\') && (path[2] == '?') && (path[3] == '\\') ) ++ return 1; ++ + if (xmlWrapStat(path, &stat_buffer) == -1) + return 0; + #else diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 20a22e46fe0f..6fd231f72470 100644..100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -54,6 +54,9 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-xpath.patch \ libxml2-global-symbols.patch \ +.IF "$(OS)" == "WNT" +PATCH_FILES+= libxml2-long-path.patch +.ENDIF # This is only for UNX environment now |