X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=993b3e751114109cd10b8f7f51b5063de4f4bf06;hb=c210cea572fd379f569260fcfee0fb85d56800ec;hp=f5fbfb8f3250d3843b4e61d714dfd475c57c7f4d;hpb=c5394f86cae6babdd822c503b56ff53804bf83f0;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index f5fbfb8..993b3e7 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -27,6 +27,50 @@ use Term::ANSIColor ();
 our $VERSION = '0.01';
 
 
+# CONSTANTS/VARIABLES
+
+# Regex to catch compiler commands.
+my $cc_regex = qr/(?:x86_64-linux-gnu-)?(?:(?<!\.)cc|gcc|g\+\+|c\+\+)(?:-[\d.]+)?/;
+# Regex to catch (GCC) compiler warnings.
+my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
+
+# Expected hardening flags. All flags are used as regexps.
+my @cflags = (
+    '-g',
+    '-O2',
+    '-fstack-protector',
+    '--param=ssp-buffer-size=4',
+    '-Wformat',
+    '-Wformat-security',
+    '-Werror=format-security',
+);
+my @cflags_pie = (
+    '-fPIE',
+);
+my @cppflags = (
+    '-D_FORTIFY_SOURCE=2',
+);
+my @ldflags = (
+    '-Wl,(-z,)?relro',
+);
+my @ldflags_pie = (
+    '-fPIE',
+    '-pie',
+);
+my @ldflags_bindnow = (
+    '-Wl,(-z,)?now',
+);
+# All (hardening) flags.
+my @flags = (@cflags, @cflags_pie,
+             @cppflags,
+             @ldflags, @ldflags_pie, @ldflags_bindnow);
+# Renaming rules for the output so the regex parts are not visible.
+my %flag_renames = (
+    '-Wl,(-z,)?relro' => '-Wl,-z,relro',
+    '-Wl,(-z,)?now'   => '-Wl,-z,now',
+);
+
+
 # FUNCTIONS
 
 sub error_flags {
@@ -117,7 +161,7 @@ sub is_non_verbose_build {
 
     if (not ($line =~ /^checking if you want to see long compiling messages\.\.\. no/
                 or $line =~ /^\s*(?:CC|CCLD)\s+(.+?)$/
-                or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)$/
+                or $line =~ /^\s*(?:C|c)ompiling\s+(.+?)(?:\.\.\.)?$/
                 or $line =~ /^\s*(?:B|b)uilding (?:program|shared library)\s+(.+?)$/
                 or $line =~ /^\s*\[[\d ]+%\] Building (?:C|CXX) object (.+?)$/)) {
         return 0;
@@ -152,50 +196,6 @@ sub is_non_verbose_build {
 }
 
 
-# CONSTANTS/VARIABLES
-
-# Regex to catch compiler commands.
-my $cc_regex = qr/(?:x86_64-linux-gnu-)?(?:(?<!\.)cc|gcc|g\+\+|c\+\+)(?:-[\d.]+)?/;
-# Regex to catch (GCC) compiler warnings.
-my $warning_regex = qr/^(.+?):([0-9]+):[0-9]+: warning: (.+?) \[(.+?)\]$/;
-
-# Expected hardening flags. All flags are used as regexps.
-my @cflags = (
-    '-g',
-    '-O2',
-    '-fstack-protector',
-    '--param=ssp-buffer-size=4',
-    '-Wformat',
-    '-Wformat-security',
-    '-Werror=format-security',
-);
-my @cflags_pie = (
-    '-fPIE',
-);
-my @cppflags = (
-    '-D_FORTIFY_SOURCE=2',
-);
-my @ldflags = (
-    '-Wl,(-z,)?relro',
-);
-my @ldflags_pie = (
-    '-fPIE',
-    '-pie',
-);
-my @ldflags_bindnow = (
-    '-Wl,(-z,)?now',
-);
-# All (hardening) flags.
-my @flags = (@cflags, @cflags_pie,
-             @cppflags,
-             @ldflags, @ldflags_pie, @ldflags_bindnow);
-# Renaming rules for the output so the regex parts are not visible.
-my %flag_renames = (
-    '-Wl,(-z,)?relro' => '-Wl,-z,relro',
-    '-Wl,(-z,)?now'   => '-Wl,-z,now',
-);
-
-
 # MAIN
 
 # Additional hardening options.
@@ -250,8 +250,14 @@ my $exit = 0;
 # Input lines, contain only the lines with compiler commands.
 my @input = ();
 
+my $start = 0;
 my $continuation = 0;
 while (my $line = <>) {
+    # We skip over unimportant lines at the beginning to prevent false
+    # positives.
+    $start = 1 if $line =~ /^dpkg-buildpackage:/;
+    next if not $start;
+
     # Ignore compiler warnings for now.
     next if $line =~ /$warning_regex/;