[Reproducible-commits] [strip-nondeterminism] 01/01: zip handler: also normalize local extra fields

[Andrew Ayer]

This is an automated email from the git hooks/post-receive script.

agwa-guest pushed a commit to branch master
in repository strip-nondeterminism.

commit f0912ff9eebcd35d94fff2fe09201fad9e117086
Author: Andrew Ayer <agwa at andrewayer.name>
Date:   Tue Jan 6 16:17:13 2015 -0800

    zip handler: also normalize local extra fields
---
 lib/File/StripNondeterminism/handlers/zip.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/File/StripNondeterminism/handlers/zip.pm b/lib/File/StripNondeterminism/handlers/zip.pm
index 11722f6..5adcdbb 100644
--- a/lib/File/StripNondeterminism/handlers/zip.pm
+++ b/lib/File/StripNondeterminism/handlers/zip.pm
@@ -62,9 +62,15 @@ sub normalize_member {
 	unlink($filename);
 }
 
+use constant {
+	CENTRAL_HEADER => 0,
+	LOCAL_HEADER => 1
+};
 sub normalize_extra_fields {
 	# See http://sources.debian.net/src/zip/3.0-6/proginfo/extrafld.txt for extra field documentation
-	my ($field) = @_;
+	# $header_type is CENTRAL_HEADER or LOCAL_HEADER.
+	# WARNING: some fields have a different format depending on the header type
+	my ($field, $header_type) = @_;
 
 	my $result = "";
 	my $pos = 0;
@@ -77,6 +83,7 @@ sub normalize_extra_fields {
 			# first byte of data contains flags.
 			$result .= substr($field, $pos, 5);
 			# len determines how many timestamps this field contains
+			# this works for both the central header and local header version
 			for (my $i = 1; $i < $len; $i += 4) {
 				$result .= pack("V", $File::StripNondeterminism::canonical_time // SAFE_EPOCH);
 			}
@@ -87,6 +94,7 @@ sub normalize_extra_fields {
 			#  UID           Variable    UID for this entry
 			#  GIDSize       1 byte      Size of GID field
 			#  GID           Variable    GID for this entry
+			# (Same format for both central header and local header)
 			if (ord(substr($field, $pos + 4, 1)) == 1) {
 				my $uid_len = ord(substr($field, $pos + 5, 1));
 				my $gid_len = ord(substr($field, $pos + 6 + $uid_len, 1));
@@ -115,7 +123,8 @@ sub normalize {
 		$options{member_normalizer}->($member) if exists $options{member_normalizer};
 		$member->setLastModFileDateTimeFromUnix($File::StripNondeterminism::canonical_time // SAFE_EPOCH);
 		$member->unixFileAttributes(0644) if $member->fileAttributeFormat() == FA_UNIX;
-		$member->cdExtraField(normalize_extra_fields($member->cdExtraField()));
+		$member->cdExtraField(normalize_extra_fields($member->cdExtraField(), CENTRAL_HEADER));
+		$member->localExtraField(normalize_extra_fields($member->localExtraField(), LOCAL_HEADER));
 	}
 	$zip->overwrite();
 	return 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/strip-nondeterminism.git