Don't color output by default, add --color option.

Thanks to Jari Aalto for the suggestion.

diff --git a/bin/blhc b/bin/blhc
index 465ce0fc04d4708fd5fbdab00f5aed68206a6d3c..f7988b5d1e5914a9b414ab504908cf506a19c67a 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -154,6 +154,9 @@ my %flag_renames = (
     '-Wl,(-z,)?now'   => '-Wl,-z,now',
 );
 
     '-Wl,(-z,)?now'   => '-Wl,-z,now',
 );
 

+# Use colored (ANSI) output?
+my $option_color;
+

 
 # FUNCTIONS
 
 
 # FUNCTIONS
 


@@ -189,8 +192,7 @@ sub error_hardening_wrapper {
 sub error_color {
     my ($message, $color) = @_;
 
 sub error_color {
     my ($message, $color) = @_;
 

-    # Use colors when writing to a terminal.
-    if (-t STDOUT) {
+    if ($option_color) {

         return Term::ANSIColor::colored($message, $color);
     } else {
         return $message;
         return Term::ANSIColor::colored($message, $color);
     } else {
         return $message;


@@ -300,6 +302,7 @@ my $option_version = 0;
 my $option_all     = 0;
 my $option_arch    = undef;
 my $option_buildd  = 0;
 my $option_all     = 0;
 my $option_arch    = undef;
 my $option_buildd  = 0;

+   $option_color   = 0;

 if (not Getopt::Long::GetOptions(
             'help|h|?' => \$option_help,
             'version'  => \$option_version,
 if (not Getopt::Long::GetOptions(
             'help|h|?' => \$option_help,
             'version'  => \$option_version,


@@ -308,6 +311,7 @@ if (not Getopt::Long::GetOptions(
             'bindnow'  => \$harden_bindnow,
             'all'      => \$option_all,
             # Misc.
             'bindnow'  => \$harden_bindnow,
             'all'      => \$option_all,
             # Misc.

+            'color'    => \$option_color,

             'arch'     => \$option_arch,
             'buildd'   => \$option_buildd,
         )) {
             'arch'     => \$option_arch,
             'buildd'   => \$option_buildd,
         )) {


@@ -623,6 +627,7 @@ B<blhc> [--pie] [--bindnow] [--all]
     --all                   force +all (+pie, +bindnow) check
     --arch                  set architecture (autodetected)
     --buildd                parser mode for buildds
     --all                   force +all (+pie, +bindnow) check
     --arch                  set architecture (autodetected)
     --buildd                parser mode for buildds

+    --color                 use colored output

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 


@@ -674,6 +679,10 @@ detected).
 
 =back
 
 
 =back
 

+=item B<--color>
+
+Use colored (ANSI) output for warning messages.
+

 =back
 
 Auto detection for B<--pie> and B<--bindnow> only works if at least one
 =back
 
 Auto detection for B<--pie> and B<--bindnow> only works if at least one

diff --git a/t/tests.t b/t/tests.t
index c462cfcc7e6d3a9f382fe51ae48cd7bc293f67d7..9d0014fced0a3a0c685718b97ce270f17a0e9bab 100644 (file)
--- a/t/tests.t
+++ b/t/tests.t
@@ -51,6 +51,7 @@ Usage:
         --all                   force +all (+pie, +bindnow) check
         --arch                  set architecture (autodetected)
         --buildd                parser mode for buildds
         --all                   force +all (+pie, +bindnow) check
         --arch                  set architecture (autodetected)
         --buildd                parser mode for buildds

+        --color                 use colored output

 
 ';
 
 
 ';