./util update, which covers various issues, but most importantly mkerr.pl

and mkdef.pl spinning in endless loop.

diff --git a/util/copy.pl b/util/copy.pl
index 73ac928ed277a6ae3f8ada78a27cf4fa23793d3a..e20b45530a8f5f645ec2717cff6cf8c1e4d0187f 100644 (file)
--- a/util/copy.pl
+++ b/util/copy.pl
@@ -11,6 +11,7 @@ use Fcntl;
 my $arg;
 
 foreach $arg (@ARGV) {
+       $arg =~ s|\\|/|g;       # compensate for bug/feature in cygwin glob...
        foreach (glob $arg)
                {
                push @filelist, $_;

diff --git a/util/libeay.num b/util/libeay.num
index 66c43f62de839bcd734f2fce773c8ccf32c9eb88..7b1d7564258a8b5617626e018103b4218bb81a34 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -75,8 +75,8 @@ BIO_new                                 78    EXIST::FUNCTION:
 BIO_new_accept                          79     EXIST::FUNCTION:
 BIO_new_connect                         80     EXIST::FUNCTION:
 BIO_new_fd                              81     EXIST::FUNCTION:
-BIO_new_file                            82     EXIST:!WIN16:FUNCTION:FP_API
-BIO_new_fp                              83     EXIST:!WIN16:FUNCTION:FP_API
+BIO_new_file                            82     EXIST::FUNCTION:FP_API
+BIO_new_fp                              83     EXIST::FUNCTION:FP_API
 BIO_new_socket                          84     EXIST::FUNCTION:
 BIO_pop                                 85     EXIST::FUNCTION:
 BIO_printf                              86     EXIST::FUNCTION:
@@ -86,7 +86,7 @@ BIO_read                                89    EXIST::FUNCTION:
 BIO_s_accept                            90     EXIST::FUNCTION:
 BIO_s_connect                           91     EXIST::FUNCTION:
 BIO_s_fd                                92     EXIST::FUNCTION:
-BIO_s_file                              93     EXIST:!WIN16:FUNCTION:FP_API
+BIO_s_file                              93     EXIST::FUNCTION:FP_API
 BIO_s_mem                               95     EXIST::FUNCTION:
 BIO_s_null                              96     EXIST::FUNCTION:
 BIO_s_proxy_client                      97     NOEXIST::FUNCTION:
@@ -356,9 +356,9 @@ OBJ_nid2sn                              363 EXIST::FUNCTION:
 OBJ_obj2nid                             364    EXIST::FUNCTION:
 OBJ_sn2nid                              365    EXIST::FUNCTION:
 OBJ_txt2nid                             366    EXIST::FUNCTION:
-PEM_ASN1_read                           367    EXIST:!WIN16:FUNCTION:
+PEM_ASN1_read                           367    EXIST::FUNCTION:
 PEM_ASN1_read_bio                       368    EXIST::FUNCTION:BIO
-PEM_ASN1_write                          369    EXIST:!WIN16:FUNCTION:
+PEM_ASN1_write                          369    EXIST::FUNCTION:
 PEM_ASN1_write_bio                      370    EXIST::FUNCTION:BIO
 PEM_SealFinal                           371    EXIST::FUNCTION:RSA
 PEM_SealInit                            372    EXIST::FUNCTION:RSA
@@ -366,14 +366,14 @@ PEM_SealUpdate                          373       EXIST::FUNCTION:RSA
 PEM_SignFinal                           374    EXIST::FUNCTION:
 PEM_SignInit                            375    EXIST::FUNCTION:
 PEM_SignUpdate                          376    EXIST::FUNCTION:
-PEM_X509_INFO_read                      377    EXIST:!WIN16:FUNCTION:
+PEM_X509_INFO_read                      377    EXIST::FUNCTION:
 PEM_X509_INFO_read_bio                  378    EXIST::FUNCTION:BIO
 PEM_X509_INFO_write_bio                 379    EXIST::FUNCTION:BIO
 PEM_dek_info                            380    EXIST::FUNCTION:
 PEM_do_header                           381    EXIST::FUNCTION:
 PEM_get_EVP_CIPHER_INFO                 382    EXIST::FUNCTION:
 PEM_proc_type                           383    EXIST::FUNCTION:
-PEM_read                                384    EXIST:!WIN16:FUNCTION:
+PEM_read                                384    EXIST::FUNCTION:
 PEM_read_DHparams                       385    EXIST:!WIN16:FUNCTION:DH
 PEM_read_DSAPrivateKey                  386    EXIST:!WIN16:FUNCTION:DSA
 PEM_read_DSAparams                      387    EXIST:!WIN16:FUNCTION:DSA
@@ -393,7 +393,7 @@ PEM_read_bio_RSAPrivateKey              400 EXIST::FUNCTION:RSA
 PEM_read_bio_X509                       401    EXIST::FUNCTION:
 PEM_read_bio_X509_CRL                   402    EXIST::FUNCTION:
 PEM_read_bio_X509_REQ                   403    EXIST::FUNCTION:
-PEM_write                               404    EXIST:!WIN16:FUNCTION:
+PEM_write                               404    EXIST::FUNCTION:
 PEM_write_DHparams                      405    EXIST:!WIN16:FUNCTION:DH
 PEM_write_DSAPrivateKey                 406    EXIST:!WIN16:FUNCTION:DSA
 PEM_write_DSAparams                     407    EXIST:!WIN16:FUNCTION:DSA
@@ -950,9 +950,9 @@ ERR_get_next_error_library              966 EXIST::FUNCTION:
 EVP_PKEY_cmp_parameters                 967    EXIST::FUNCTION:
 HMAC_cleanup                            968    NOEXIST::FUNCTION:
 BIO_ptr_ctrl                            969    EXIST::FUNCTION:
-BIO_new_file_internal                   970    EXIST:WIN16:FUNCTION:FP_API
-BIO_new_fp_internal                     971    EXIST:WIN16:FUNCTION:FP_API
-BIO_s_file_internal                     972    EXIST:WIN16:FUNCTION:FP_API
+BIO_new_file_internal                   970    NOEXIST::FUNCTION:
+BIO_new_fp_internal                     971    NOEXIST::FUNCTION:
+BIO_s_file_internal                     972    NOEXIST::FUNCTION:
 BN_BLINDING_convert                     973    EXIST::FUNCTION:
 BN_BLINDING_invert                      974    EXIST::FUNCTION:
 BN_BLINDING_update                      975    EXIST::FUNCTION:
@@ -984,8 +984,8 @@ BIO_ghbn_ctrl                           1003        NOEXIST::FUNCTION:
 CRYPTO_free_ex_data                     1004   EXIST::FUNCTION:
 CRYPTO_get_ex_data                      1005   EXIST::FUNCTION:
 CRYPTO_set_ex_data                      1007   EXIST::FUNCTION:
-ERR_load_CRYPTO_strings                 1009   EXIST:!OS2,!VMS,!WIN16:FUNCTION:
-ERR_load_CRYPTOlib_strings              1009   EXIST:OS2,VMS,WIN16:FUNCTION:
+ERR_load_CRYPTO_strings                 1009   EXIST:!OS2,!VMS:FUNCTION:
+ERR_load_CRYPTOlib_strings              1009   EXIST:OS2,VMS:FUNCTION:
 EVP_PKEY_bits                           1010   EXIST::FUNCTION:
 MD5_Transform                           1011   EXIST::FUNCTION:MD5
 SHA1_Transform                          1012   EXIST::FUNCTION:SHA,SHA1
@@ -2732,8 +2732,8 @@ EC_POINT_point2oct                      3178      EXIST::FUNCTION:EC
 KRB5_APREQ_free                         3179   EXIST::FUNCTION:
 ASN1_OBJECT_it                          3180   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:
 ASN1_OBJECT_it                          3180   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:
-OCSP_crlID_new                          3181   EXIST:!OS2,!VMS,!WIN16:FUNCTION:
-OCSP_crlID2_new                         3181   EXIST:OS2,VMS,WIN16:FUNCTION:
+OCSP_crlID_new                          3181   EXIST:!OS2,!VMS:FUNCTION:
+OCSP_crlID2_new                         3181   EXIST:OS2,VMS:FUNCTION:
 CONF_modules_load_file                  3182   EXIST::FUNCTION:
 CONF_imodule_set_usr_data               3183   EXIST::FUNCTION:
 ENGINE_set_default_string               3184   EXIST::FUNCTION:ENGINE
@@ -3421,3 +3421,4 @@ WHIRLPOOL                               3819      EXIST::FUNCTION:WHIRLPOOL
 WHIRLPOOL_BitUpdate                     3820   EXIST::FUNCTION:WHIRLPOOL
 WHIRLPOOL_Final                         3821   EXIST::FUNCTION:WHIRLPOOL
 WHIRLPOOL_Update                        3822   EXIST::FUNCTION:WHIRLPOOL
+DSO_global_lookup                       3823   EXIST::FUNCTION:

diff --git a/util/mkdef.pl b/util/mkdef.pl
index 3eac54426292430f98e7d47f800581d924fea9fe..36860548b4627407c9170001b8799c4a666bbb90 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -454,17 +454,22 @@ sub do_defs
                                next;
                        }
 
-                       $cpp = 1 if /^\#.*ifdef.*cplusplus/;
+                       if(/\/\*/) {
+                               if (not /\*\//) {       # multiline comment...
+                                       $line = $_;     # ... just accumulate
+                                       next;
+                               } else {
+                                       s/\/\*.*?\*\///gs;# wipe it
+                               }
+                       }
+
                        if ($cpp) {
-                               $cpp = 0 if /^\#.*endif/;
+                               $cpp++ if /^#\s*if/;
+                               $cpp-- if /^#\s*endif/;
                                next;
                        }
+                       $cpp = 1 if /^#.*ifdef.*cplusplus/;
 
-                       s/\/\*.*?\*\///gs;                   # ignore comments
-                       if (/\/\*/) {                        # if we have part
-                               $line = $_;                  # of a comment,
-                               next;                        # continue reading
-                       }
                        s/{[^{}]*}//gs;                      # ignore {} blocks
                        print STDERR "DEBUG: \$def=\"$def\"\n" if $debug && $def ne "";
                        print STDERR "DEBUG: \$_=\"$_\"\n" if $debug;
@@ -840,6 +845,17 @@ sub do_defs
                        next if(/typedef\W/);
                        next if(/\#define/);
 
+                       # Reduce argument lists to empty ()
+                       # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
+                       while(/\(.*\)/s) {
+                               s/\([^\(\)]+\)/\{\}/gs;
+                               s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;    #(*f{}) -> f
+                       }
+                       # pretend as we didn't use curly braces: {} -> ()
+                       s/\{\}/\(\)/gs;
+
+                       s/STACK_OF\(\)/void/gs;
+
                        print STDERR "DEBUG: \$_ = \"$_\"\n" if $debug;
                        if (/^\#INFO:([^:]*):(.*)$/) {
                                $plats = $1;
@@ -850,25 +866,11 @@ sub do_defs
                                $s = $1;
                                $k = "VARIABLE";
                                print STDERR "DEBUG: found external variable $s\n" if $debug;
-                       } elsif (/\(\*(\w*(\{[0-9]+\})?)\([^\)]+/) {
-                               $s = $1;
-                               print STDERR "DEBUG: found ANSI C function $s\n" if $debug;
-                       } elsif (/\w+\W+(\w+)\W*\(\s*\)(\s*__attribute__\(.*\)\s*)?$/s) {
-                               # K&R C
-                               print STDERR "DEBUG: found K&R C function $s\n" if $debug;
+                       } elsif (/TYPEDEF_\w+_OF/s) {
                                next;
-                       } elsif (/\w+\W+\w+(\{[0-9]+\})?\W*\(.*\)(\s*__attribute__\(.*\)\s*)?$/s) {
-                               while (not /\(\)(\s*__attribute__\(.*\)\s*)?$/s) {
-                                       s/[^\(\)]*\)(\s*__attribute__\(.*\)\s*)?$/\)/s;
-                                       s/\([^\(\)]*\)\)(\s*__attribute__\(.*\)\s*)?$/\)/s;
-                               }
-                               s/\(void\)//;
-                               /(\w+(\{[0-9]+\})?)\W*\(\)/s;
-                               $s = $1;
+                       } elsif (/(\w+)\s*\(\).*/s) {   # first token prior [first] () is
+                               $s = $1;                # a function name!
                                print STDERR "DEBUG: found function $s\n" if $debug;
-
-                       } elsif (/TYPEDEF_\w+_OF/) {
-                               next;
                        } elsif (/\(/ and not (/=/)) {
                                print STDERR "File $file: cannot parse: $_;\n";
                                next;

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 7e0bdff8cc3fa4fbded4782357157a3554fe2ed5..030899b7ab449f6cbfac737ef758477c4d1046d1 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -143,11 +143,14 @@ while (($hdr, $lib) = each %libinc)
            s/[\n\s]*$//g;
 
            # Skip over recognized non-function declarations
-           next if(/typedef\W/ or /struct\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
+           next if(/typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
 
            # Reduce argument lists to empty ()
            # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
-           while(/\(.*\)/s) { s/\([^\(\)]+\)/\{\}/gs; }
+           while(/\(.*\)/s) {
+               s/\([^\(\)]+\)/\{\}/gs;
+               s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;    #(*f{}) -> f
+           }
            # pretend as we didn't use curly braces: {} -> ()
            s/\{\}/\(\)/gs;