aboutsummaryrefslogtreecommitdiffstats
path: root/xmlIO.c
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2001-08-14 12:18:09 +0000
committerDaniel Veillard <veillard@src.gnome.org>2001-08-14 12:18:09 +0000
commitfe70332f7f29f146a364c73450729a8b3274daee (patch)
tree15c2812b07d703a6cdeff950f1933fa9c22549bd /xmlIO.c
parent70ac0e3e2e1dee65b7b6e7487ad6ae43bb79a4de (diff)
downloadandroid_external_libxml2-fe70332f7f29f146a364c73450729a8b3274daee.tar.gz
android_external_libxml2-fe70332f7f29f146a364c73450729a8b3274daee.tar.bz2
android_external_libxml2-fe70332f7f29f146a364c73450729a8b3274daee.zip
count() was broken on Result Value Tree fixed file:/// accesses on _WIN32
* xpath.c: count() was broken on Result Value Tree * xmlIO.c: fixed file:/// accesses on _WIN32 Daniel
Diffstat (limited to 'xmlIO.c')
-rw-r--r--xmlIO.c32
1 files changed, 24 insertions, 8 deletions
diff --git a/xmlIO.c b/xmlIO.c
index c21a168e..b78ccbe7 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -244,9 +244,13 @@ xmlFileOpen (const char *filename) {
if (!strncmp(filename, "file://localhost", 16))
path = &filename[16];
- else if (!strncmp(filename, "file:///", 8))
+ else if (!strncmp(filename, "file:///", 8)) {
+#ifdef _WIN32
+ path = &filename[8];
+#else
path = &filename[7];
- else
+#endif
+ } else
path = filename;
if (path == NULL)
@@ -283,9 +287,13 @@ xmlFileOpenW (const char *filename) {
if (!strncmp(filename, "file://localhost", 16))
path = &filename[16];
- else if (!strncmp(filename, "file:///", 8))
+ else if (!strncmp(filename, "file:///", 8)) {
+#ifdef _WIN32
+ path = &filename[8];
+#else
path = &filename[7];
- else
+#endif
+ } else
path = filename;
if (path == NULL)
@@ -387,9 +395,13 @@ xmlGzfileOpen (const char *filename) {
if (!strncmp(filename, "file://localhost", 16))
path = &filename[16];
- else if (!strncmp(filename, "file:///", 8))
+ else if (!strncmp(filename, "file:///", 8)) {
+#ifdef _WIN32
+ path = &filename[8];
+#else
path = &filename[7];
- else
+#endif
+ } else
path = filename;
if (path == NULL)
@@ -425,9 +437,13 @@ xmlGzfileOpenW (const char *filename, int compression) {
if (!strncmp(filename, "file://localhost", 16))
path = &filename[16];
- else if (!strncmp(filename, "file:///", 8))
+ else if (!strncmp(filename, "file:///", 8)) {
+#ifdef _WIN32
+ path = &filename[8];
+#else
path = &filename[7];
- else
+#endif
+ } else
path = filename;
if (path == NULL)