[PHP-CVS] cvs: php-src(PHP_5_3) /ext/zip/lib zip_open.c

[Pierre-Alain Joye]

pajoye          Fri Jan  2 00:07:57 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/zip/lib        zip_open.c 
  Log:
  - MFB: restore overwrite feature (regression introduced in 5.2.8)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/lib/zip_open.c?r1=1.1.2.4.2.5&r2=1.1.2.4.2.6&diff_format=u
Index: php-src/ext/zip/lib/zip_open.c
diff -u php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.5 
php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.6
--- php-src/ext/zip/lib/zip_open.c:1.1.2.4.2.5  Wed Dec 31 11:15:47 2008
+++ php-src/ext/zip/lib/zip_open.c      Fri Jan  2 00:07:57 2009
@@ -65,10 +65,14 @@
     struct zip_cdir *cdir;
     int i;
     off_t len;
-    
+
+
     switch (_zip_file_exists(fn, flags, zep)) {
     case -1:
-       return NULL;
+                       if (!(flags & ZIP_OVERWRITE)) {
+                               return NULL;
+                       }
+                       
     case 0:
        return _zip_allocate_new(fn, zep);
     default:
@@ -440,7 +444,7 @@
     }
     
     if (stat(fn, &st) != 0) {
-       if (flags & ZIP_CREATE)
+       if (flags & ZIP_CREATE || flags & ZIP_OVERWRITE)
            return 0;
        else {
            set_error(zep, NULL, ZIP_ER_OPEN);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php