openssl-engine-0.9.6 merge

1 files changed, 12 insertions, 2 deletions

diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl
index 8e18f3c2df..7d98b5234d 100644
--- a/src/lib/libcrypto/util/mkerr.pl
+++ b/src/lib/libcrypto/util/mkerr.pl
@@ -38,7 +38,7 @@ while (@ARGV) {
 }
 
 if($recurse) {
-        @source = (<crypto/*.c>, <crypto/*/*.c>, ,<rsaref/*.c>, <ssl/*.c>);
+        @source = (<crypto/*.c>, <crypto/*/*.c>, <rsaref/*.c>, <ssl/*.c>);
 } else {
         @source = @ARGV;
 }
@@ -79,8 +79,11 @@ while (($lib, $hdr) = each %hinc)
         next if($hdr eq "NONE");
         print STDERR "Scanning header file $hdr\n" if $debug; 
         open(IN, "<$hdr") || die "Can't open Header file $hdr\n";
-        my $line = "", $def= "";
+        my $line = "", $def= "", $linenr = 0;
         while(<IN>) {
+            $linenr++;
+            print STDERR "line: $linenr\r" if $debug;
+
             last if(/BEGIN\s+ERROR\s+CODES/);
             if ($line ne '') {
                 $_ = $line . $_;
@@ -110,7 +113,12 @@ while (($lib, $hdr) = each %hinc)
             }
         }
 
+        print STDERR "                                  \r" if $debug;
+        $defnr = 0;
         foreach (split /;/, $def) {
+            $defnr++;
+            print STDERR "def: $defnr\r" if $debug;
+
             s/^[\n\s]*//g;
             s/[\n\s]*$//g;
             next if(/typedef\W/);
@@ -136,6 +144,8 @@ while (($lib, $hdr) = each %hinc)
             }
         }
 
+        print STDERR "                                  \r" if $debug;
+
         next if $reindex;
 
         # Scan function and reason codes and store them: keep a note of the