From 24ae3bed4d22f3d6cd40fa604650f3073a93b352 Mon Sep 17 00:00:00 2001
From: Tom van der Woerdt <info@tvdw.eu>
Date: Wed, 17 Jul 2013 18:32:58 +0200
Subject: [PATCH 1/4] Implement POSIX.1-1988 UStar support without having to go
through GNU tar
---
src/_h5ai/server/php/inc/Archive.php | 52 ++++++++++++++++++++++++++--
1 file changed, 50 insertions(+), 2 deletions(-)
diff --git a/src/_h5ai/server/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php
index 2068775e..1a73abbc 100644
--- a/src/_h5ai/server/php/inc/Archive.php
+++ b/src/_h5ai/server/php/inc/Archive.php
@@ -57,7 +57,7 @@ class Archive {
try {
if ($format === "tar") {
- $cmd = Archive::$TAR_PASSTHRU_CMD;
+ return $this->create_tar();
} else if ($format === "zip") {
$cmd = Archive::$ZIP_PASSTHRU_CMD;
} else {
@@ -77,6 +77,54 @@ class Archive {
}
+ private function create_tar() {
+
+ // POSIX.1-1988 UStar implementation, by @TvdW
+
+ $root_path = $this->app->get_root_abs_path();
+
+ foreach (array_values($this->files) as $file) {
+
+ // TAR supports filenames up to 253 chars, but the name should be split ubti a 154-byte prefix and 99-byte name
+ assert(substr($file, 0, strlen($root_path)) == $root_path);
+ $local_filename = normalize_path(substr($file, strlen($root_path) + 1));
+ $filename_parts = array('', substr($local_filename, -99));
+ if (strlen($local_filename) > 99) $filename_parts[0] = substr($local_filename, 0, -99);
+ if (strlen($filename_parts[0]) > 154) $filename_parts[0] = substr($filename_parts[0], -154);
+
+ $size = filesize($file);
+
+ $file_header =
+ str_pad($filename_parts[1], 100, "\0") // first filename part
+ ."0000755\0"."0000000\0"."0000000\0" // File mode and uid/gid
+ .str_pad(decoct($size), 11, "0", STR_PAD_LEFT)."\0" // File size
+ .str_pad(decoct(time()), 11, "0", STR_PAD_LEFT)."\0" // Modification time
+ ." " // checksum (filled in later)
+ ."0" // file type
+ .str_repeat("\0", 100)
+ ."ustar 00"
+ .str_repeat("\0", 92)
+ .str_pad($filename_parts[0], 155, "\0");
+ assert(strlen($file_header) == 512);
+
+ // Checksum
+ $checksum = array_sum(array_map('ord', str_split($file_header)));
+ $checksum = str_pad(decoct($checksum), 6, "0", STR_PAD_LEFT)."\0 ";
+ $file_header = substr_replace($file_header, $checksum, 148, 8);
+
+ echo $file_header;
+ readfile($file);
+
+ $pad_file = 512 - ($size % 512);
+ if ($pad_file) echo str_repeat("\0", $pad_file);
+
+ }
+
+ return 0;
+
+ }
+
+
private function add_hrefs($hrefs) {
foreach ($hrefs as $href) {
@@ -132,4 +180,4 @@ class Archive {
}
}
-?>
\ No newline at end of file
+?>
From 89acf0cafc976ec2f3d15c000f4754fb0ccdbcf8 Mon Sep 17 00:00:00 2001
From: Tom van der Woerdt <info@tvdw.eu>
Date: Wed, 17 Jul 2013 18:50:04 +0200
Subject: [PATCH 2/4] Fix the Tar creator for cases where filenames aren't
absolute
---
src/_h5ai/server/php/inc/Archive.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/_h5ai/server/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php
index 1a73abbc..8377b79e 100644
--- a/src/_h5ai/server/php/inc/Archive.php
+++ b/src/_h5ai/server/php/inc/Archive.php
@@ -86,7 +86,11 @@ class Archive {
foreach (array_values($this->files) as $file) {
// TAR supports filenames up to 253 chars, but the name should be split ubti a 154-byte prefix and 99-byte name
- assert(substr($file, 0, strlen($root_path)) == $root_path);
+ if (substr($file, 0, strlen($root_path)) != $root_path) {
+ $file = $this->app->get_abs_path().'/'.$file;
+ }
+ if (!file_exists($file)) continue;
+
$local_filename = normalize_path(substr($file, strlen($root_path) + 1));
$filename_parts = array('', substr($local_filename, -99));
if (strlen($local_filename) > 99) $filename_parts[0] = substr($local_filename, 0, -99);
From e815f4d070919a1e8b43f092ae6dacd13c9b68fb Mon Sep 17 00:00:00 2001
From: Tom van der Woerdt <info@tvdw.eu>
Date: Wed, 17 Jul 2013 19:07:10 +0200
Subject: [PATCH 3/4] Tar: predict total archive size and send the header
---
src/_h5ai/server/php/inc/Archive.php | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/_h5ai/server/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php
index 8377b79e..d253aeda 100644
--- a/src/_h5ai/server/php/inc/Archive.php
+++ b/src/_h5ai/server/php/inc/Archive.php
@@ -83,20 +83,34 @@ class Archive {
$root_path = $this->app->get_root_abs_path();
+ // Build a list of filesizes so we can predict the total size
+ $filesizes = array();
+ $total_size = 0;
foreach (array_values($this->files) as $file) {
- // TAR supports filenames up to 253 chars, but the name should be split ubti a 154-byte prefix and 99-byte name
if (substr($file, 0, strlen($root_path)) != $root_path) {
$file = $this->app->get_abs_path().'/'.$file;
}
if (!file_exists($file)) continue;
+ $size = filesize($file);
+ $filesizes[$file] = $size;
+
+ $total_size += 512 + $size + (512 - ($size % 512));
+
+ }
+
+ header('Content-Length: '.$total_size);
+
+ foreach (array_keys($filesizes) as $file) {
+
+ // TAR supports filenames up to 253 chars, but the name should be split ubti a 154-byte prefix and 99-byte name
$local_filename = normalize_path(substr($file, strlen($root_path) + 1));
$filename_parts = array('', substr($local_filename, -99));
if (strlen($local_filename) > 99) $filename_parts[0] = substr($local_filename, 0, -99);
if (strlen($filename_parts[0]) > 154) $filename_parts[0] = substr($filename_parts[0], -154);
- $size = filesize($file);
+ $size = $filesizes[$file];
$file_header =
str_pad($filename_parts[1], 100, "\0") // first filename part
From 53e32b598652e05d8a98bf123d8b9a3a514f126d Mon Sep 17 00:00:00 2001
From: Tom van der Woerdt <info@tvdw.eu>
Date: Wed, 17 Jul 2013 19:12:00 +0200
Subject: [PATCH 4/4] Fix the size prediction for files where (size%512==0)
---
src/_h5ai/server/php/inc/Archive.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/_h5ai/server/php/inc/Archive.php b/src/_h5ai/server/php/inc/Archive.php
index d253aeda..adc1d263 100644
--- a/src/_h5ai/server/php/inc/Archive.php
+++ b/src/_h5ai/server/php/inc/Archive.php
@@ -96,7 +96,8 @@ class Archive {
$size = filesize($file);
$filesizes[$file] = $size;
- $total_size += 512 + $size + (512 - ($size % 512));
+ $total_size += 512 + $size;
+ if ($size % 512 != 0) $total_size += 512 - ($size % 512);
}