From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 18 Mar 2012 16:29:44 +0000 (-0700)
Subject: More fixes for gzopen_w().
X-Git-Tag: v1.2.7~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e16df2c3f0dbe0f8a819e1913562073cf721636;p=thirdparty%2Fzlib-ng.git

More fixes for gzopen_w().

Also need to #include <stddef.h> for zlib.h, and need to workaround
the inability to use wide characters in constructed error messages
with zlib's interface.
---

diff --git a/gzlib.c b/gzlib.c
index b99c26c7b..e31533b74 100644
--- a/gzlib.c
+++ b/gzlib.c
@@ -185,12 +185,13 @@ local gzFile gz_open(path, fd, mode)
     }
 
     /* save the path name for error messages */
-    state->path = malloc(strlen(path) + 1);
+#   define WPATH "<widepath>"
+    state->path = malloc(strlen(fd == -2 ? WPATH : (path) + 1);
     if (state->path == NULL) {
         free(state);
         return NULL;
     }
-    strcpy(state->path, path);
+    strcpy(state->path, fd == -2 ? WPATH : path);
 
     /* compute the flags for open() */
     oflag =
diff --git a/zconf.h b/zconf.h
index f9a5fa7d6..8c6f945e3 100644
--- a/zconf.h
+++ b/zconf.h
@@ -402,6 +402,10 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
+#ifdef _WIN32
+#  include <stddef.h>           /* for wchar_t */
+#endif
+
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
  * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
  * though the former does not conform to the LFS document), but considering
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 66368adf9..4ade48745 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -404,6 +404,10 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
+#ifdef _WIN32
+#  include <stddef.h>           /* for wchar_t */
+#endif
+
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
  * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
  * though the former does not conform to the LFS document), but considering
diff --git a/zconf.h.in b/zconf.h.in
index f9a5fa7d6..8c6f945e3 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -402,6 +402,10 @@ typedef uLong FAR uLongf;
 #  endif
 #endif
 
+#ifdef _WIN32
+#  include <stddef.h>           /* for wchar_t */
+#endif
+
 /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
  * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
  * though the former does not conform to the LFS document), but considering