generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove last chomps

Browse Source 
In the previous commit to change all chomp to a more flexible regexp,
Configure was forgotten.  This completes the change.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-12 12:10:27 +01:00
parent c6f9019b69
commit 04f171c096
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configure
View File

@ -456,7 +456,7 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
# centered information gathering the reading configdata.pm # centered information gathering the reading configdata.pm
# #
while (<IN>) { while (<IN>) {
chomp; s|\R$||;
if (/^CONFIGURE_ARGS=\s*(.*)\s*/) { if (/^CONFIGURE_ARGS=\s*(.*)\s*/) {
# Older form, we split the string and hope for the best # Older form, we split the string and hope for the best
@argvcopy = split /\s+/, $_; @argvcopy = split /\s+/, $_;
@ -1333,7 +1333,7 @@ if ($builder eq "unified") {
my $lineiterator = shift; my $lineiterator = shift;
my $target_kind = $1; my $target_kind = $1;
while (defined $lineiterator->()) { while (defined $lineiterator->()) {
chomp; s|\R$||;
if (/^\s*ENDRAW\[((?:\\.|[^\\\]])+)\]\s*$/) { if (/^\s*ENDRAW\[((?:\\.|[^\\\]])+)\]\s*$/) {
die "ENDRAW doesn't match BEGINRAW" die "ENDRAW doesn't match BEGINRAW"
if $1 ne $target_kind; if $1 ne $target_kind;
@ -2292,7 +2292,7 @@ sub collect_from_file {
my $saved_line = ""; my $saved_line = "";
$_ = ""; $_ = "";
while (<$fh>) { while (<$fh>) {
chomp; s|\R$||;
if (defined $line_concat) { if (defined $line_concat) {
$_ = $line_concat->($saved_line, $_); $_ = $line_concat->($saved_line, $_);
$saved_line = ""; $saved_line = "";
@ -2323,7 +2323,7 @@ sub collect_from_array {
my $saved_line = ""; my $saved_line = "";
$_ = ""; $_ = "";
while (defined($_ = shift @array)) { while (defined($_ = shift @array)) {
chomp; s|\R$||;
if (defined $line_concat) { if (defined $line_concat) {
$_ = $line_concat->($saved_line, $_); $_ = $line_concat->($saved_line, $_);
$saved_line = ""; $saved_line = "";
@ -2348,7 +2348,7 @@ sub collect_information {
my %collectors = @_; my %collectors = @_;
while(defined($_ = $lineiterator->())) { while(defined($_ = $lineiterator->())) {
chomp; s|\R$||;
my $found = 0; my $found = 0;
foreach my $re (keys %collectors) { foreach my $re (keys %collectors) {
if ($re ne "OTHERWISE" && /$re/) { if ($re ne "OTHERWISE" && /$re/) {