提交 04f171c0 编写于 作者: R Richard Levitte

Remove last chomps

In the previous commit to change all chomp to a more flexible regexp,
Configure was forgotten.  This completes the change.
Reviewed-by: NAndy Polyakov <appro@openssl.org>
上级 c6f9019b
......@@ -456,7 +456,7 @@ if (grep /^reconf(igure)?$/, @argvcopy) {
# centered information gathering the reading configdata.pm
#
while (<IN>) {
chomp;
s|\R$||;
if (/^CONFIGURE_ARGS=\s*(.*)\s*/) {
# Older form, we split the string and hope for the best
@argvcopy = split /\s+/, $_;
......@@ -1333,7 +1333,7 @@ if ($builder eq "unified") {
my $lineiterator = shift;
my $target_kind = $1;
while (defined $lineiterator->()) {
chomp;
s|\R$||;
if (/^\s*ENDRAW\[((?:\\.|[^\\\]])+)\]\s*$/) {
die "ENDRAW doesn't match BEGINRAW"
if $1 ne $target_kind;
......@@ -2292,7 +2292,7 @@ sub collect_from_file {
my $saved_line = "";
$_ = "";
while (<$fh>) {
chomp;
s|\R$||;
if (defined $line_concat) {
$_ = $line_concat->($saved_line, $_);
$saved_line = "";
......@@ -2323,7 +2323,7 @@ sub collect_from_array {
my $saved_line = "";
$_ = "";
while (defined($_ = shift @array)) {
chomp;
s|\R$||;
if (defined $line_concat) {
$_ = $line_concat->($saved_line, $_);
$saved_line = "";
......@@ -2348,7 +2348,7 @@ sub collect_information {
my %collectors = @_;
while(defined($_ = $lineiterator->())) {
chomp;
s|\R$||;
my $found = 0;
foreach my $re (keys %collectors) {
if ($re ne "OTHERWISE" && /$re/) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册