diff options
author | Kyungwook Tak <k.tak@samsung.com> | 2015-08-31 16:15:21 +0900 |
---|---|---|
committer | Kyungwook Tak <k.tak@samsung.com> | 2015-08-31 16:16:50 +0900 |
commit | 13ea66c69fd44fadc3e1493311a74537b8cb5d7c (patch) | |
tree | c31b529ad95ce803d01be8e6b29c2525e7af56e1 /util | |
parent | 9b8531ea0e590efa2ac959b824e1a350dace84b9 (diff) | |
download | openssl-13ea66c69fd44fadc3e1493311a74537b8cb5d7c.tar.gz openssl-13ea66c69fd44fadc3e1493311a74537b8cb5d7c.tar.bz2 openssl-13ea66c69fd44fadc3e1493311a74537b8cb5d7c.zip |
Imported Upstream version 1.0.1pupstream/1.0.1p
Change-Id: I297624cdcb5d68a3442cdf4666722e66ce7a264b
Diffstat (limited to 'util')
-rwxr-xr-x | util/mk1mf.pl | 2 | ||||
-rw-r--r-- | util/mkerr.pl | 21 | ||||
-rw-r--r-- | util/pl/BC-32.pl | 2 | ||||
-rw-r--r-- | util/pl/VC-32.pl | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 550ef9f..1eee7aa 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -326,7 +326,7 @@ open(IN,"<$infile") || die "unable to open $infile:$!\n"; $_=<IN>; for (;;) { - chop; + s/\s*$//; # was chop, didn't work in mixture of perls for Windows... ($key,$val)=/^([^=]+)=(.*)/; if ($key eq "RELATIVE_DIRECTORY") diff --git a/util/mkerr.pl b/util/mkerr.pl index 8d2fdbc..d87c4fd 100644 --- a/util/mkerr.pl +++ b/util/mkerr.pl @@ -534,14 +534,21 @@ EOF # First, read any existing reason string definitions: my %err_reason_strings; if (open(IN,"<$cfile")) { + my $line = ""; while (<IN>) { - if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { - $err_reason_strings{$1} = $2; - } - if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { - if (!exists $ftrans{$1} && ($1 ne $2)) { - print STDERR "WARNING: Mismatched function string $2\n"; - $ftrans{$1} = $2; + chomp; + $_ = $line . $_; + $line = ""; + if (/{ERR_(FUNC|REASON)\(/) { + if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) { + $err_reason_strings{$1} = $2; + } elsif (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) { + if (!exists $ftrans{$1} && ($1 ne $2)) { + print STDERR "WARNING: Mismatched function string $2\n"; + $ftrans{$1} = $2; + } + } else { + $line = $_; } } } diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index b41bb45..6d03664 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -130,7 +130,7 @@ sub do_link_rule local($ret,$_); $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($targer); + $n=&bname($target); $ret.="$target: $files $dep_libs\n"; $ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n"; return($ret); diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 3705fc7..b597998 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -341,7 +341,7 @@ sub do_link_rule my($target,$files,$dep_libs,$libs,$standalone)=@_; local($ret,$_); $file =~ s/\//$o/g if $o ne '/'; - $n=&bname($targer); + $n=&bname($target); $ret.="$target: $files $dep_libs\n"; if ($standalone == 1) { |