fix bug #3691: Fix for Bug 2413 create regression for ARM lib files.
authorkelvzhu
Mon, 25 Oct 2010 11:53:21 +0800
changeset 653 8ee61c1e0c5c
parent 649 02d78c9f018e
child 654 7c11c3d8d025
fix bug #3691: Fix for Bug 2413 create regression for ARM lib files.
bintools/evalid/EvalidCompare.pm
--- a/bintools/evalid/EvalidCompare.pm	Wed Oct 13 17:57:18 2010 +0800
+++ b/bintools/evalid/EvalidCompare.pm	Mon Oct 25 11:53:21 2010 +0800
@@ -231,7 +231,7 @@
     }
   }
 
-  if ($typeBuf =~ /^!<arch>\x0A(.{48}([0-9 ]{9})\x60\x0A(......))/s) {
+  if ($typeBuf =~ /^!<arch>\x0A(.{48}([0-9 ]{9}).\x60\x0A(......))/s) {
     # library - could be MARM or WINS
 
     $typeBuf = $1;
@@ -240,7 +240,7 @@
     open (FILE, $file) or die "Error: Couldn't open \"$file\" for reading: $!\n";
     binmode (FILE);
     
-    while ($typeBuf =~ /^.{48}([0-9 ]{9})\x60\x0A(......)/s) {
+    while ($typeBuf =~ /^.{48}([0-9 ]{9}).\x60\x0A(......)/s) {
       # $1 is the size of the archive member, $2 is first 6 bytes of the file
       # There may be several different sorts of file in the archive, and we
       # need to scan through until we find a type we recognize: