archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 06:58:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- MFB: restore overwrite feature (regression introduced in 5.2.8)

Browse source
This commit is contained in:
Pierre Joye 2009-01-02 00:07:57 +00:00
parent 14f2f4148c
commit d00fb8b360
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/zip/lib/zip_open.c
View file

@ -65,10 +65,14 @@ zip_open(const char *fn, int flags, int *zep)
struct zip_cdir *cdir; struct zip_cdir *cdir;
int i; int i;
off_t len; off_t len;
switch (_zip_file_exists(fn, flags, zep)) { switch (_zip_file_exists(fn, flags, zep)) {
case -1: case -1:
return NULL; if (!(flags & ZIP_OVERWRITE)) {
return NULL;
}
case 0: case 0:
return _zip_allocate_new(fn, zep); return _zip_allocate_new(fn, zep);
default: default:
@ -440,7 +444,7 @@ _zip_file_exists(const char *fn, int flags, int *zep)
} }
if (stat(fn, &st) != 0) { if (stat(fn, &st) != 0) {
if (flags & ZIP_CREATE) if (flags & ZIP_CREATE || flags & ZIP_OVERWRITE)
return 0; return 0;
else { else {
set_error(zep, NULL, ZIP_ER_OPEN); set_error(zep, NULL, ZIP_ER_OPEN);