X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=bin%2Fblhc;h=618fa7698dc69406157114cd56bcd866dcdfc31d;hb=2fe2ed37ef0b9093272f674bd9323a3516af7b40;hp=5d408c31e0c6a70aaa5360c9c9ae667785abd001;hpb=efdac689c531b78c27e7ec2c9e03af621c104e40;p=blhc%2Fblhc.git

diff --git a/bin/blhc b/bin/blhc
index 5d408c3..618fa76 100755
--- a/bin/blhc
+++ b/bin/blhc
@@ -471,12 +471,13 @@ while (my $line = <>) {
     # line. parse_line() is slow, only use it when necessary.
     my @line = (not $line =~ /;/)
              ? ($line)
-             : Text::ParseWords::parse_line(';', 1, $line);
+             : map {
+                   # Ensure newline at the line end - necessary for correct
+                   # parsing later.
+                   $_ =~ s/\s+$//;
+                   $_ .= "\n";
+               } Text::ParseWords::parse_line(';', 1, $line);
     foreach $line (@line) {
-        # Add newline, drop all other whitespace at the end of a line.
-        $line =~ s/\s+$//;
-        $line .= "\n";
-
         if ($continuation) {
             $continuation = 0;
 
@@ -560,12 +561,12 @@ if ($option_arch) {
 
 # Check the specified hardening options, same order as dpkg-buildflags.
 if ($harden_pie) {
-    @cflags  = (@cflags,  @cflags_pie);
+    @cflags   = (@cflags,   @cflags_pie);
     @cxxflags = (@cxxflags, @cflags_pie);
-    @ldflags = (@ldflags, @ldflags_pie);
+    @ldflags  = (@ldflags,  @ldflags_pie);
 }
 if ($harden_stack) {
-    @cflags = (@cflags, @cflags_stack);
+    @cflags   = (@cflags,   @cflags_stack);
     @cxxflags = (@cxxflags, @cflags_stack);
 }
 if ($harden_fortify) {
@@ -574,7 +575,7 @@ if ($harden_fortify) {
     @cppflags = (@cppflags, @cppflags_fortify);
 }
 if ($harden_format) {
-    @cflags = (@cflags, @cflags_format);
+    @cflags   = (@cflags,   @cflags_format);
     @cxxflags = (@cxxflags, @cflags_format);
 }
 if ($harden_relro) {