summaryrefslogtreecommitdiff
path: root/gzlib.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-03-18 09:29:44 -0700
committerMark Adler <madler@alumni.caltech.edu>2012-03-18 09:29:44 -0700
commit8e16df2c3f0dbe0f8a819e1913562073cf721636 (patch)
tree1c91e0b2ccc16ad31c941f5ecfd063776a1bf30d /gzlib.c
parenta1af6e96e35dfc3adfa2acba01883c14115f1090 (diff)
downloadzlib-8e16df2c3f0dbe0f8a819e1913562073cf721636.tar.gz
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.
Diffstat (limited to 'gzlib.c')
-rw-r--r--gzlib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gzlib.c b/gzlib.c
index b99c26c..e31533b 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 =