提交 76c1183d 编写于 作者: V Viktor Szakats 提交者: Rich Salz

use whitespace more consistently

Reviewed-by: NRichard Levitte <levitte@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
上级 e771eea6
...@@ -10,38 +10,38 @@ binmode IN1; ...@@ -10,38 +10,38 @@ binmode IN1;
$tot=0; $tot=0;
$ret=1; $ret=1;
for (;;) for (;;)
{ {
$n1=sysread(IN0,$b1,4096); $n1=sysread(IN0,$b1,4096);
$n2=sysread(IN1,$b2,4096); $n2=sysread(IN1,$b2,4096);
last if ($n1 != $n2); last if ($n1 != $n2);
last if ($b1 ne $b2); last if ($b1 ne $b2);
last if ($n1 < 0); last if ($n1 < 0);
if ($n1 == 0) if ($n1 == 0)
{ {
$ret=0; $ret=0;
last; last;
} }
$tot+=$n1; $tot+=$n1;
} }
close(IN0); close(IN0);
close(IN1); close(IN1);
if ($ret) if ($ret)
{ {
printf STDERR "$ARGV[0] and $ARGV[1] are different\n"; printf STDERR "$ARGV[0] and $ARGV[1] are different\n";
@a1=unpack("C*",$b1); @a1=unpack("C*",$b1);
@a2=unpack("C*",$b2); @a2=unpack("C*",$b2);
for ($i=0; $i<=$#a1; $i++) for ($i=0; $i<=$#a1; $i++)
{ {
if ($a1[$i] ne $a2[$i]) if ($a1[$i] ne $a2[$i])
{ {
printf "%02X %02X <<\n",$a1[$i],$a2[$i]; printf "%02X %02X <<\n",$a1[$i],$a2[$i];
last; last;
} }
} }
$nm=$tot+$n1; $nm=$tot+$n1;
$tot+=$i+1; $tot+=$i+1;
printf STDERR "diff at char $tot of $nm\n"; printf STDERR "diff at char $tot of $nm\n";
} }
exit($ret); exit($ret);
...@@ -7,17 +7,17 @@ unpack("L",pack("N",1))!=1 || die "only little-endian hosts are supported"; ...@@ -7,17 +7,17 @@ unpack("L",pack("N",1))!=1 || die "only little-endian hosts are supported";
# first argument can specify custom suffix... # first argument can specify custom suffix...
$suffix=(@ARGV[0]=~/^\$/) ? shift(@ARGV) : "\$m"; $suffix=(@ARGV[0]=~/^\$/) ? shift(@ARGV) : "\$m";
################################################################# #################################################################
# rename segments in COFF modules according to %map table below # # rename segments in COFF modules according to %map table below #
%map=( ".text" => "fipstx$suffix", # %map=( ".text" => "fipstx$suffix", #
".text\$"=> "fipstx$suffix", # ".text\$"=> "fipstx$suffix", #
".rdata"=> "fipsrd$suffix", # ".rdata" => "fipsrd$suffix", #
".data" => "fipsda$suffix" ); # ".data" => "fipsda$suffix" ); #
################################################################# #################################################################
# collect file list # collect file list
foreach (@ARGV) { foreach (@ARGV) {
if (/\*/) { push(@files,glob($_)); } if (/\*/) { push(@files,glob($_)); }
else { push(@files,$_); } else { push(@files,$_); }
} }
use Fcntl; use Fcntl;
...@@ -33,13 +33,13 @@ foreach (@files) { ...@@ -33,13 +33,13 @@ foreach (@files) {
sysread(FD,$mz,64)==64 || die "$file is too short"; sysread(FD,$mz,64)==64 || die "$file is too short";
@dos_header=unpack("a2C58I",$mz); @dos_header=unpack("a2C58I",$mz);
if (@dos_header[0] eq "MZ") { if (@dos_header[0] eq "MZ") {
$e_lfanew=pop(@dos_header); $e_lfanew=pop(@dos_header);
sysseek(FD,$e_lfanew,SEEK_SET) || die "$file is too short"; sysseek(FD,$e_lfanew,SEEK_SET) || die "$file is too short";
sysread(FD,$Magic,4)==4 || die "$file is too short"; sysread(FD,$Magic,4)==4 || die "$file is too short";
unpack("I",$Magic)==0x4550 || die "$file is not COFF image"; unpack("I",$Magic)==0x4550 || die "$file is not COFF image";
} elsif ($file =~ /\.obj$/i) { } elsif ($file =~ /\.obj$/i) {
# .obj files have no IMAGE_DOS_HEADER # .obj files have no IMAGE_DOS_HEADER
sysseek(FD,0,SEEK_SET) || die "unable to rewind $file"; sysseek(FD,0,SEEK_SET) || die "unable to rewind $file";
} else { next; } } else { next; }
# read IMAGE_FILE_HEADER # read IMAGE_FILE_HEADER
...@@ -53,13 +53,13 @@ foreach (@files) { ...@@ -53,13 +53,13 @@ foreach (@files) {
# traverse IMAGE_SECTION_HEADER table # traverse IMAGE_SECTION_HEADER table
for($i=0;$i<$NumberOfSections;$i++) { for($i=0;$i<$NumberOfSections;$i++) {
sysread(FD,$SectionHeader,40)==40 || die "$file is too short"; sysread(FD,$SectionHeader,40)==40 || die "$file is too short";
($Name,@opaque)=unpack("Z8C*",$SectionHeader); ($Name,@opaque)=unpack("Z8C*",$SectionHeader);
if ($map{$Name}) { if ($map{$Name}) {
sysseek(FD,-40,SEEK_CUR) || die "unable to rewind $file"; sysseek(FD,-40,SEEK_CUR) || die "unable to rewind $file";
syswrite(FD,pack("a8C*",$map{$Name},@opaque))==40 || die "syswrite failed: $!"; syswrite(FD,pack("a8C*",$map{$Name},@opaque))==40 || die "syswrite failed: $!";
printf " %-8s -> %.8s\n",$Name,$map{$Name} unless $quiet; printf " %-8s -> %.8s\n",$Name,$map{$Name} unless $quiet;
} }
} }
close(FD); close(FD);
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册