clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename archive during compressAllFiles*()

Browse Source 
Note: this only works for tar archives at present pending a fix for bug #13352
This commit is contained in:
Steph Fox 2008-03-09 04:46:16 +00:00
parent f0b329da20
commit 3ee08069a6
9 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/phar/phar_internal.h
View File

@ -376,7 +376,7 @@ char *phar_create_default_stub(const char *index_php, const char *web_index, siz
char * phar_decompress_filter(phar_entry_info * entry, int return_unknown);
char * phar_compress_filter(phar_entry_info * entry, int return_unknown);
void phar_rename_archive(phar_archive_data *phar, char *ext TSRMLS_DC);
void phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool compress TSRMLS_DC);
int phar_mount_entry(phar_archive_data *phar, char *filename, int filename_len, char *path, int path_len TSRMLS_DC);
char *phar_find_in_include_path(char *file, char *entry, phar_archive_data *phar TSRMLS_DC);
char *phar_fix_filepath(char *path, int *new_len, int use_cwd TSRMLS_DC);

14
ext/phar/phar_object.c
View File

@ -1734,7 +1734,7 @@ static void phar_convert_to_other(phar_archive_data *source, int convert, char *
source->is_temporary_alias = 0;
source->flags = phar.flags;
phar_rename_archive(source, ext TSRMLS_CC);
phar_rename_archive(source, ext, 0 TSRMLS_CC);
phar_flush(source, 0, 0, convert, &error TSRMLS_CC);
}
/* }}} */
@ -2432,8 +2432,10 @@ PHP_METHOD(Phar, compressAllFilesGZ)
} else {
pharobj_set_compression(&phar_obj->arc.archive->manifest, PHAR_ENT_COMPRESSED_GZ TSRMLS_CC);
}
phar_obj->arc.archive->is_modified = 1;
phar_rename_archive(phar_obj->arc.archive, NULL, 1 TSRMLS_CC);
phar_flush(phar_obj->arc.archive, 0, 0, 0, &error TSRMLS_CC);
if (error) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, error);
@ -2471,8 +2473,10 @@ PHP_METHOD(Phar, compressAllFilesBZIP2)
} else {
pharobj_set_compression(&phar_obj->arc.archive->manifest, PHAR_ENT_COMPRESSED_BZ2 TSRMLS_CC);
}
phar_obj->arc.archive->is_modified = 1;
phar_rename_archive(phar_obj->arc.archive, NULL, 1 TSRMLS_CC);
phar_flush(phar_obj->arc.archive, 0, 0, 0, &error TSRMLS_CC);
if (error) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, error);
@ -2504,8 +2508,10 @@ PHP_METHOD(Phar, uncompressAllFiles)
} else {
pharobj_set_compression(&phar_obj->arc.archive->manifest, PHAR_ENT_COMPRESSED_NONE TSRMLS_CC);
}
phar_obj->arc.archive->is_modified = 1;
phar_rename_archive(phar_obj->arc.archive, NULL, 0 TSRMLS_CC);
phar_flush(phar_obj->arc.archive, 0, 0, 0, &error TSRMLS_CC);
if (error) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, error);

2
ext/phar/tests/phar_oo_compressallbz2.phpt
View File

@ -44,7 +44,7 @@ var_dump($phar['b']->isCompressedBZIP2());
===DONE===
--CLEAN--
<?php
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
?>
--EXPECTF--
string(1) "a"

2
ext/phar/tests/phar_oo_compressallgz.phpt
View File

@ -44,7 +44,7 @@ var_dump($phar['b']->isCompressedBZIP2());
===DONE===
--CLEAN--
<?php
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
?>
--EXPECTF--
string(1) "a"

2
ext/phar/tests/phar_oo_getmodified.phpt
View File

@ -27,7 +27,7 @@ var_dump($phar->getModified());
===DONE===
--CLEAN--
<?php
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
?>
--EXPECTF--
bool(false)

2
ext/phar/tests/phar_oo_uncompressall.phpt
View File

@ -52,7 +52,7 @@ var_dump($phar['a']->isCompressed());
===DONE===
--CLEAN--
<?php
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php');
unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
?>
--EXPECTF--
string(1) "a"

15
ext/phar/tests/tar/tar_makebz2.phpt
View File

@ -10,18 +10,17 @@ phar.readonly=0
<?php
$fname = dirname(__FILE__) . '/tar_makebz2.phar.tar';
$alias = 'phar://' . $fname;
$fname2 = dirname(__FILE__) . '/tar_makebz2_b.phar.tar';
$alias2 = 'phar://' . $fname2;
$fname2 = dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2';
$fname3 = dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2';
$phar = new Phar($fname);
$phar['test'] = 'hi';
var_dump($phar->isTar());
$phar->compressAllFilesBZIP2();
copy($fname, $fname2);
copy($fname2, $fname3);
$phar2 = new Phar($fname2);
$phar2 = new Phar($fname3);
var_dump($phar2->isTar());
var_dump($phar2->isCompressed() == Phar::BZ2);
@ -29,11 +28,11 @@ var_dump($phar2->isCompressed() == Phar::BZ2);
===DONE===
--CLEAN--
<?php
@unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar');
@unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar');
@unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar.bz2');
@unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar.bz2');
?>
--EXPECTF--
bool(true)
bool(true)
bool(true)
===DONE===
===DONE===

15
ext/phar/tests/tar/tar_makegz.phpt
View File

@ -9,19 +9,18 @@ phar.readonly=0
--FILE--
<?php
$fname = dirname(__FILE__) . '/tar_makegz.phar.tar';
$alias = 'phar://' . $fname;
$fname2 = dirname(__FILE__) . '/tar_makegz_b.phar.tar';
$alias2 = 'phar://' . $fname2;
$fname = dirname(__FILE__) . '/tar_makebz2.phar.tar';
$fname2 = dirname(__FILE__) . '/tar_makebz2.phar.tar.gz';
$fname3 = dirname(__FILE__) . '/tar_makebz2_b.phar.tar.gz';
$phar = new Phar($fname);
$phar['test'] = 'hi';
var_dump($phar->isTar());
$phar->compressAllFilesGZ();
copy($fname, $fname2);
copy($fname2, $fname3);
$phar2 = new Phar($fname2);
$phar2 = new Phar($fname3);
var_dump($phar2->isTar());
var_dump($phar2->isCompressed() == Phar::GZ);
@ -29,8 +28,8 @@ var_dump($phar2->isCompressed() == Phar::GZ);
===DONE===
--CLEAN--
<?php
@unlink(dirname(__FILE__) . '/tar_makegz.phar.tar');
@unlink(dirname(__FILE__) . '/tar_makegz_b.phar.tar');
@unlink(dirname(__FILE__) . '/tar_makebz2.phar.tar.gz');
@unlink(dirname(__FILE__) . '/tar_makebz2_b.phar.tar.gz');
?>
--EXPECTF--
bool(true)

12
ext/phar/util.c
View File

@ -72,12 +72,22 @@ int phar_seek_efp(phar_entry_info *entry, off_t offset, int whence, off_t positi
return php_stream_seek(fp, temp, SEEK_SET);
}
void phar_rename_archive(phar_archive_data *phar, char *ext TSRMLS_DC)
void phar_rename_archive(phar_archive_data *phar, char *ext, zend_bool compress TSRMLS_DC)
{
char *oldname = NULL, *oldpath = NULL;
char *basename = NULL, *basepath = NULL;
char *newname = NULL, *newpath = NULL;
if (phar->flags && compress) {
char *error;
phar_flush(phar, 0, 0, 0, &error TSRMLS_CC);
if (error) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, error);
efree(error);
}
}
if (!ext) {
if (phar->is_zip) {
if (phar->is_data) {