[strip-nondeterminism] 01/03: handlers/{ar, zip}.pm: Explicitly use oct(..) for integers with leading zeroes.

[Chris Lamb]

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

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

commit 7b09295085a355b4369bfc230e792f0e3f0b5491
Author: Chris Lamb <lamby at debian.org>
Date:   Sat Sep 3 17:16:37 2016 +0100

    handlers/{ar,zip}.pm: Explicitly use oct(..) for integers with leading zeroes.
---
 lib/File/StripNondeterminism/handlers/ar.pm  | 2 +-
 lib/File/StripNondeterminism/handlers/zip.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/File/StripNondeterminism/handlers/ar.pm b/lib/File/StripNondeterminism/handlers/ar.pm
index 7b22679..f70245b 100644
--- a/lib/File/StripNondeterminism/handlers/ar.pm
+++ b/lib/File/StripNondeterminism/handlers/ar.pm
@@ -74,7 +74,7 @@ sub normalize {
 		# group
 		syswrite $fh, sprintf("%-6d", 0);
 		# file mode
-		syswrite $fh, sprintf("%-8o", ($file_mode & 0100) ? 0755 : 0644);
+		syswrite $fh, sprintf("%-8o", ($file_mode & oct(100)) ? oct(755) : oct(644));
 
 		# move to next member
 		my $padding = $file_size % 2;
diff --git a/lib/File/StripNondeterminism/handlers/zip.pm b/lib/File/StripNondeterminism/handlers/zip.pm
index 3d36934..7f2dd6f 100644
--- a/lib/File/StripNondeterminism/handlers/zip.pm
+++ b/lib/File/StripNondeterminism/handlers/zip.pm
@@ -154,12 +154,12 @@ sub normalize {
 		$options{member_normalizer}->($member) if exists $options{member_normalizer};
 		$member->setLastModFileDateTimeFromUnix($File::StripNondeterminism::canonical_time // SAFE_EPOCH);
 		if ($member->fileAttributeFormat() == FA_UNIX) {
-			$member->unixFileAttributes(($member->unixFileAttributes() & 0100) ? 0755 : 0644);
+			$member->unixFileAttributes(($member->unixFileAttributes() & oct(100)) ? oct(755) : oct(644));
 		}
 		$member->cdExtraField(normalize_extra_fields($member->cdExtraField(), CENTRAL_HEADER));
 		$member->localExtraField(normalize_extra_fields($member->localExtraField(), LOCAL_HEADER));
 	}
-	my $old_perms = (stat($zip_filename))[2] & 07777;
+	my $old_perms = (stat($zip_filename))[2] & oct(7777);
 	$zip->overwrite();
 	chmod($old_perms, $zip_filename);
 	return 1;

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