Skip to content
Snippets Groups Projects
Commit 7b092950 authored by Chris Lamb's avatar Chris Lamb :eyes:
Browse files

handlers/{ar,zip}.pm: Explicitly use oct(..) for integers with leading zeroes.

parent 4902feb2
Branches
Tags
No related merge requests found
......@@ -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;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment