diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:29 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:29 +0100 |
| commit | ce74a5d149f0fa2a257d52dc4bf65c23c9bb23d2 (patch) | |
| tree | 815c9a7e74453c6de5e2d14c6662f910bfdf10c4 /libxml2 | |
| parent | 9ffd61c43e4df7a0536ad71fc9cd61b814632e29 (diff) | |
| parent | e77a065bab11a45dc64f0277038674d25af0279a (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
graphite/makefile.mk
libxml2/makefile.mk
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-long-path.patch | 34 | ||||
| -rwxr-xr-x[-rw-r--r--] | libxml2/makefile.mk | 4 |
2 files changed, 38 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 3cf7988080df..9e69e67f67e2 100644..100755 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -56,6 +56,10 @@ PATCH_FILES=libxml2-configure.patch \ libxml2-aix.patch \ libxml2-vc10.patch +.IF "$(OS)" == "WNT" +PATCH_FILES+= libxml2-long-path.patch +.ENDIF + # This is only for UNX environment now .IF "$(OS)"=="WNT" |