Use here-doc for --version output.

[blhc/blhc.git] / bin / blhc

diff --git a/bin/blhc b/bin/blhc
index cfe49d2a3335527a1dcca61fbe80ff264b4640b5..e2658ae9f329f96959ef5b229d8035a6fa1f5172 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -500,15 +500,17 @@ sub compile_flag_regexp {
 
     my @result = ();
     foreach my $flag (@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.
         # 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;
 
             = (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;
 }
     }
     return @result;
 }


@@ -517,14 +519,12 @@ sub compile_flag_regexp {
 sub extension_found {
     my ($extensions_ref, @extensions) = @_;
 
 sub extension_found {
     my ($extensions_ref, @extensions) = @_;
 

-    my $found = 0;

     foreach my $extension (@extensions) {
         if (exists $extensions_ref->{$extension}) {
     foreach my $extension (@extensions) {
         if (exists $extensions_ref->{$extension}) {

-            $found = 1;
-            last;
+            return 1;

         }
     }
         }
     }

-    return $found;
+    return 0;

 }
 
 
 }
 
 


@@ -570,7 +570,8 @@ if ($option_help) {
     Pod::Usage::pod2usage(1);
 }
 if ($option_version) {
     Pod::Usage::pod2usage(1);
 }
 if ($option_version) {

-    print "blhc $VERSION  Copyright (C) 2012-2013  Simon Ruderich
+    print <<"EOF";
+blhc $VERSION  Copyright (C) 2012-2013  Simon Ruderich

 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by


@@ -584,7 +585,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

-";
+EOF

     exit 0;
 }
 
     exit 0;
 }