- add overwrite mode to ZipArchive::open, always starts a new archive

- fix build with php6
- remove safemode when built against php6

diff --git a/ext/zip/lib/zip.h b/ext/zip/lib/zip.h
index 93c791f14cc4572d2b323b30b87e4073412d8b2d..8cf690cad3fe63c4ca14a0cad7a6e800e87d955d 100644 (file)
--- a/ext/zip/lib/zip.h
+++ b/ext/zip/lib/zip.h
@@ -53,6 +53,7 @@ extern "C" {
 #define ZIP_CREATE           1
 #define ZIP_EXCL             2
 #define ZIP_CHECKCONS        4
+#define ZIP_OVERWRITE        8
 
 
 /* flags for zip_name_locate, zip_fopen, zip_stat, ... */

diff --git a/ext/zip/lib/zip_open.c b/ext/zip/lib/zip_open.c
index 65ba8a5b9f63f1fc8b5d2adabfa3774becfad81b..0a14abda583fdf546afaffe7f20e97f51b196d5f 100644 (file)
--- a/ext/zip/lib/zip_open.c
+++ b/ext/zip/lib/zip_open.c
@@ -74,9 +74,9 @@ zip_open(const char *fn, int flags, int *zep)
        set_error(zep, NULL, ZIP_ER_INVAL);
        return NULL;
     }
-    
-    if (stat(fn, &st) != 0) {
-       if (flags & ZIP_CREATE) {
+
+    if (flags & ZIP_OVERWRITE || stat(fn, &st) != 0) {
+       if ((flags & ZIP_CREATE) || (flags & ZIP_OVERWRITE)) {
            if ((za=_zip_new(&error)) == NULL) {
                set_error(zep, &error, 0);
                return NULL;
@@ -99,14 +99,15 @@ zip_open(const char *fn, int flags, int *zep)
        set_error(zep, NULL, ZIP_ER_EXISTS);
        return NULL;
     }
+
+
     /* ZIP_CREATE gets ignored if file exists and not ZIP_EXCL,
        just like open() */
-    
-    if ((fp=fopen(fn, "rb")) == NULL) {
-       set_error(zep, NULL, ZIP_ER_OPEN);
-       return NULL;
-    }
-    
+       if ((fp=fopen(fn, "rb")) == NULL) {
+               set_error(zep, NULL, ZIP_ER_OPEN);
+               return NULL;
+       }
+
     clearerr(fp);
     fseek(fp, 0, SEEK_END);
     len = ftell(fp);

diff --git a/ext/zip/lib/zip_replace.c b/ext/zip/lib/zip_replace.c
index 011bbc2af08b7a3e529d6b72db8b613e58a44234..ae78e62b800fb71fd092e5a3aaf6a828d7e81a7d 100644 (file)
--- a/ext/zip/lib/zip_replace.c
+++ b/ext/zip/lib/zip_replace.c
@@ -66,11 +66,14 @@ _zip_replace(struct zip *za, int idx, const char *name,
                        return -1;
                idx = za->nentry - 1;
        }
-    
+
+   
     _zip_unchange_data(za->entry+idx);
 
     if (name && _zip_set_name(za, idx, name) != 0)
                return -1;
+ 
+
     za->entry[idx].state = ((za->cdir == NULL || idx >= za->cdir->nentry)
                            ? ZIP_ST_ADDED : ZIP_ST_REPLACED);
     za->entry[idx].source = source;

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index 96b8e4d578977f3316b2126072fb29214403ed88..ec3867e04eeeb0705267a6f4eb5ad541aa6515cc 100644 (file)
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -39,8 +39,14 @@ static int le_zip_entry;
 /* }}} */
 
 /* {{{ SAFEMODE_CHECKFILE(filename) */
+#if (PHP_MAJOR_VERSION < 6)
 #define SAFEMODE_CHECKFILE(filename) \
-       (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC)
+       if (PG(safe_mode) && (!php_checkuid(filename, NULL, CHECKUID_CHECK_FILE_AND_DIR))) || php_check_open_basedir(filename TSRMLS_CC) { \
+               RETURN_FALSE; \
+       } 
+#else 
+#define SAFEMODE_CHECKFILE(filename);
+#endif
 /* }}} */
 
 /* {{{ PHP_ZIP_STAT_INDEX(za, index, flags, sb) */
@@ -111,7 +117,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file TSRMLS_D
                len = spprintf(&file_dirname_fullpath, 0, "%s", dest);
        }
 
-       php_basename(file, file_len, NULL, 0, &file_basename, &file_basename_len TSRMLS_CC);
+       php_basename(file, file_len, NULL, 0, &file_basename, (int *)&file_basename_len TSRMLS_CC);
 
        SAFEMODE_CHECKFILE(file_dirname_fullpath);
 
@@ -152,8 +158,11 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file TSRMLS_D
                efree(file_basename);
                return 0;
        }
-
+#if (PHP_MAJOR_VERSION < 6)
        stream = php_stream_open_wrapper(fullpath, "w+b", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL);
+#else
+       stream = php_stream_open_wrapper(fullpath, "w+b", REPORT_ERRORS, NULL);
+#endif
        n = 0;
        if (stream) {
                while ((n=zip_fread(zf, b, sizeof(b))) > 0) php_stream_write(stream, b, n);
@@ -613,9 +622,8 @@ PHP_FUNCTION(zip_open)
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &mode) == FAILURE) {
                return;
        }
-       if (SAFEMODE_CHECKFILE(filename)) {
-               RETURN_FALSE;
-       }
+
+       SAFEMODE_CHECKFILE(filename);
 
        rsrc_int = (zip_rsrc *)emalloc(sizeof(zip_rsrc));
 
@@ -956,6 +964,7 @@ ZIPARCHIVE_METHOD(addFile)
        int entry_name_len = 0;
        struct zip_source *zs;
        long offset_start = 0, offset_len = 0;
+       int cur_idx;
 
        if (!this) {
                RETURN_FALSE;
@@ -979,15 +988,29 @@ ZIPARCHIVE_METHOD(addFile)
                entry_name_len = filename_len;
        }
 
-       if (SAFEMODE_CHECKFILE(filename)) {
-               RETURN_FALSE;
-       }
+       SAFEMODE_CHECKFILE(filename);
 
        zs = zip_source_file(intern, filename, 0, 0);
        if (!zs) {
                RETURN_FALSE;
        }
-       if (zip_add(intern, entry_name, zs) < 0) {
+
+       cur_idx = zip_name_locate(intern, (const char *)entry_name, 0);
+       /* TODO: fix  _zip_replace */
+       if (cur_idx<0) {
+               /* reset the error */
+               if (intern->error.str) {
+                       _zip_error_fini(&intern->error);
+               }
+               _zip_error_init(&intern->error);
+
+       } else {
+               if (zip_delete(intern, cur_idx) == -1) {
+                       RETURN_FALSE;
+               }
+       }
+
+       if (zip_add(intern, entry_name, zs) == -1) {
                RETURN_FALSE;
        } else {
                RETURN_TRUE;
@@ -1006,6 +1029,7 @@ ZIPARCHIVE_METHOD(addFromString)
        ze_zip_object *ze_obj;
        struct zip_source *zs;
        int pos = 0;
+       int cur_idx;
 
        if (!this) {
                RETURN_FALSE;
@@ -1037,8 +1061,25 @@ ZIPARCHIVE_METHOD(addFromString)
                RETURN_FALSE;
        }
 
+       cur_idx = zip_name_locate(intern, (const char *)name, 0);
+       /* TODO: fix  _zip_replace */
+       if (cur_idx<0) {
+               /* reset the error */
+               if (intern->error.str) {
+                       _zip_error_fini(&intern->error);
+               }
+               _zip_error_init(&intern->error);
+
+       } else {
+               if (zip_delete(intern, cur_idx) == -1) {
+                       RETURN_FALSE;
+               }
+       }
+
        if (zip_add(intern, name, zs) == -1) {
                RETURN_FALSE;
+       } else {
+               RETURN_TRUE;
        }
 }
 /* }}} */
@@ -1845,6 +1886,8 @@ PHP_MINIT_FUNCTION(zip)
        REGISTER_ZIP_CLASS_CONST_LONG("CREATE", ZIP_CREATE);
        REGISTER_ZIP_CLASS_CONST_LONG("EXCL", ZIP_EXCL);
        REGISTER_ZIP_CLASS_CONST_LONG("CHECKCONS", ZIP_CHECKCONS);
+       REGISTER_ZIP_CLASS_CONST_LONG("OVERWRITE", ZIP_OVERWRITE);
+
        REGISTER_ZIP_CLASS_CONST_LONG("FL_NOCASE", ZIP_FL_NOCASE);
        REGISTER_ZIP_CLASS_CONST_LONG("FL_NODIR", ZIP_FL_NODIR);
        REGISTER_ZIP_CLASS_CONST_LONG("FL_COMPRESSED", ZIP_FL_COMPRESSED);

diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index 2b194f7583ce4ffa7eedd38bc09091add9cc00b4..ac9b875226be734df6c317022fc506cc5cfdd8fb 100644 (file)
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -37,7 +37,7 @@ extern zend_module_entry zip_module_entry;
 #include "lib/zip.h"
 
 #ifndef ZEND_ENGINE_2_1
-# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0)
+# if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION > 0) || PHP_MAJOR_VERSION == 6
 #  define ZEND_ENGINE_2_1
 # endif
 #endif