diff options
| author | Pierre Joye <pajoye@php.net> | 2006-11-15 19:14:02 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2006-11-15 19:14:02 +0000 |
| commit | 892c00bb9f8ab68a870de5ec7f252d88048c69a4 (patch) | |
| tree | b8a6ddc4c0c9caa4422e4fa1e056cf65acb0a6fa /ext/zip/lib/zip_open.c | |
| parent | 82fb3e00b8259d6be0c1d2274069d4235846e6d6 (diff) | |
| download | php-git-892c00bb9f8ab68a870de5ec7f252d88048c69a4.tar.gz | |
#9278 and #39506, force the binary mode for the zip operation only. At least I do not have to set/restore it in each function.
Diffstat (limited to 'ext/zip/lib/zip_open.c')
| -rw-r--r-- | ext/zip/lib/zip_open.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c index c8d45146db..f2f3cc3bc4 100644 --- a/ext/zip/lib/zip_open.c +++ b/ext/zip/lib/zip_open.c @@ -75,10 +75,6 @@ zip_open(const char *fn, int flags, int *zep) return NULL; } -#ifdef PHP_WIN32 - _fmode = _O_BINARY; -#endif - if (flags & ZIP_OVERWRITE || stat(fn, &st) != 0) { if ((flags & ZIP_CREATE) || (flags & ZIP_OVERWRITE)) { if ((za=_zip_new(&error)) == NULL) { @@ -104,7 +100,6 @@ zip_open(const char *fn, int flags, int *zep) return NULL; } - /* ZIP_CREATE gets ignored if file exists and not ZIP_EXCL, just like open() */ if ((fp=fopen(fn, "rb")) == NULL) { @@ -112,6 +107,10 @@ zip_open(const char *fn, int flags, int *zep) return NULL; } +#ifdef PHP_WIN32 + _setmode(_fileno(fp), _O_BINARY ); +#endif + clearerr(fp); fseek(fp, 0, SEEK_END); len = ftell(fp); |