X-Git-Url: https://ruderich.org/simon/gitweb/?p=blhc%2Fblhc.git;a=blobdiff_plain;f=bin%2Fblhc;h=c7457d2c79c1f4780741d60e5cc25725794fc2c4;hp=dc71cc1c940d1130660dd9574ba27aa7c72e6bb1;hb=19728cda633b5ab8e207a95bb22c5b526bd239c4;hpb=6bd8ae07ae91c53c36d219975bc3296b7af81045 diff --git a/bin/blhc b/bin/blhc index dc71cc1..c7457d2 100755 --- a/bin/blhc +++ b/bin/blhc @@ -176,7 +176,8 @@ my $file_extension_regex = qr/ # terminated with "\n". /x; -# Expected (hardening) flags. All flags are used as regexps. +# Expected (hardening) flags. All flags are used as regexps (and compiled to +# real regexps below for better execution speed). my @def_cflags = ( '-g', '-O(?:2|3)', @@ -475,6 +476,7 @@ sub is_non_verbose_build { return 1; } +# Remove @flags from $flag_refs_ref, and $flag_renames_ref. sub remove_flags { my ($flag_refs_ref, $flag_renames_ref, @flags) = @_; @@ -492,35 +494,37 @@ sub remove_flags { return; } +# Modifies $flag_renames_ref hash. sub compile_flag_regexp { my ($flag_renames_ref, @flags) = @_; my @result = (); foreach my $flag (@flags) { + # Compile flag regexp for faster execution. + my $regex = qr/\s$flag(?:\s|\\)/; + # Store flag name in replacement string for correct flags in messages # with qr//ed flag regexps. - $flag_renames_ref->{qr/\s$flag(?:\s|\\)/} + $flag_renames_ref->{$regex} = (exists $flag_renames_ref->{$flag}) ? $flag_renames_ref->{$flag} : $flag; - # Compile flag regexp for faster execution. - push @result, qr/\s$flag(?:\s|\\)/; + push @result, $regex; } return @result; } +# Does any extension in @extensions exist in %{$extensions_ref}? sub extension_found { my ($extensions_ref, @extensions) = @_; - my $found = 0; foreach my $extension (@extensions) { if (exists $extensions_ref->{$extension}) { - $found = 1; - last; + return 1; } } - return $found; + return 0; } @@ -1023,7 +1027,8 @@ LINE: } next; } - # Even if it's a verbose build, we might have to skip this line. + # Even if it's a verbose build, we might have to skip this line (see + # is_non_verbose_build()). next if $skip; # Remove everything until and including the compiler command. Makes