diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-02-24 18:27:56 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-02-24 18:27:56 +0000 |
| commit | 73a2c56104cdf97f35a0e1a417bbc3ec8e005050 (patch) | |
| tree | 016c55adc178c22a08a7c693294a26463bd63686 /phpBB/includes/functions_compress.php | |
| parent | 724b37ae9706c24b23833da67565dc20d7d78045 (diff) | |
| download | forums-73a2c56104cdf97f35a0e1a417bbc3ec8e005050.tar forums-73a2c56104cdf97f35a0e1a417bbc3ec8e005050.tar.gz forums-73a2c56104cdf97f35a0e1a417bbc3ec8e005050.tar.bz2 forums-73a2c56104cdf97f35a0e1a417bbc3ec8e005050.tar.xz forums-73a2c56104cdf97f35a0e1a417bbc3ec8e005050.zip | |
- We only write to the archive ONCE for every file and folder when working with tar files
- Checksum is faster, uses some precomputation to speed things up
- We only needed to pad the end of the archive with 512 nulls, not 1024 :D
- Added some comments regarding the other fields ;-)
git-svn-id: file:///svn/phpbb/trunk@5581 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_compress.php')
| -rw-r--r-- | phpBB/includes/functions_compress.php | 53 |
1 files changed, 26 insertions, 27 deletions
diff --git a/phpBB/includes/functions_compress.php b/phpBB/includes/functions_compress.php index a69cc2ee6d..b12a81a04d 100644 --- a/phpBB/includes/functions_compress.php +++ b/phpBB/includes/functions_compress.php @@ -477,7 +477,7 @@ class compress_tar extends compress if ($this->wrote) { $fzwrite = ($this->isbz && function_exists('bzwrite')) ? 'bzwrite' : (($this->isgz && extension_loaded('zlib')) ? 'gzwrite' : 'fwrite'); - $fzwrite($this->fp, pack("a1024", "")); + $fzwrite($this->fp, pack("a512", "")); // Symbolizes that there are no more files } $fzclose($this->fp); @@ -492,39 +492,38 @@ class compress_tar extends compress // This is the header data, it contains all the info we know about the file or folder that we are about to archive $header = ''; - $header .= pack("a100", $name); - $header .= pack("a8", sprintf("%07o", $stat[2])); - $header .= pack("a8", sprintf("%07o", $stat[4])); - $header .= pack("a8", sprintf("%07o", $stat[5])); - $header .= pack("a12", sprintf("%011o", $stat[7])); - $header .= pack("a12", sprintf("%011o", $stat[9])); - $header .= pack("a8", ' '); - $header .= pack("a1", $typeflag); - $header .= pack("a100", ''); - $header .= pack("a6", 'ustar'); - $header .= pack("a2", '00'); - $header .= pack("a32", 'Unknown'); - $header .= pack("a32", 'Unknown'); - $header .= pack("a8", ''); - $header .= pack("a8", ''); - $header .= pack("a155", ''); - $header .= pack("a12", ''); + $header .= pack("a100", $name); // file name + $header .= pack("a8", sprintf("%07o", $stat[2])); // file mode + $header .= pack("a8", sprintf("%07o", $stat[4])); // owner id + $header .= pack("a8", sprintf("%07o", $stat[5])); // group id + $header .= pack("a12", sprintf("%011o", $stat[7])); // file size + $header .= pack("a12", sprintf("%011o", $stat[9])); // last mod time // Checksum $checksum = 0; - for ($i = 0; $i < 329; $i++) + for ($i = 0; $i < 148; $i++) { $checksum += ord(substr($header, $i, 1)); } - $header = substr_replace($header, pack("a8", sprintf("%07o", $checksum)), 148, 8); - $fzwrite($this->fp, $header); - - if ($stat[7] !== 0 && !$is_dir) - { - $fzwrite($this->fp, $data . (($stat[7] % 512 > 0) ? str_repeat("\0", 512 - $stat[7] % 512) : '')); - unset($data); - } + // We precompute the rest of the hash, this saves us time in the loop and allows us to insert our hash without resorting to string functions + $checksum += 2415 + (($is_dir) ? 53 : 0); + + $header .= pack("a8", sprintf("%07o", $checksum)); // checksum + $header .= pack("a1", $typeflag); // link indicator + $header .= pack("a100", ''); // name of linked file + $header .= pack("a6", 'ustar'); // ustar indicator + $header .= pack("a2", '00'); // ustar version + $header .= pack("a32", 'Unknown'); // owner name + $header .= pack("a32", 'Unknown'); // group name + $header .= pack("a8", ''); // device major number + $header .= pack("a8", ''); // device minor number + $header .= pack("a155", ''); // filename prefix + $header .= pack("a12", ''); // end + + // This writes the entire file in one shot. Header, followed by data and then null padded to a multiple of 512 + $fzwrite($this->fp, $header . (($stat[7] !== 0 && !$is_dir) ? $data . (($stat[7] % 512 > 0) ? str_repeat("\0", 512 - $stat[7] % 512) : '') : '')); + unset($data); } function open() |