prepare anchor match during option parsing

[barcat.git] / barcat

diff --git a/barcat b/barcat
index db630abb6ba6d92bf0ef0d2043c61e97a840f379..e6b22b6872becc110a6fe3934077c51e61851b8a 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -17,7 +17,9 @@ my %opt;
 GetOptions(\%opt,
        'color|c!',
        'C' => sub { $opt{color} = 0 },
-       'field|f=s',
+       'field|f=s' => sub {
+               $opt{anchor} = /^[0-9]+$/ ? qr/(?:\S*\h+){$_}\K/ : $_ for $_[1];
+       },
        'human-readable|H!',
        'interval|t:i',
        'trim|length|l=s' => sub {
@@ -51,7 +53,8 @@ GetOptions(\%opt,
 $opt{width} ||= $ENV{COLUMNS} || 80;
 $opt{color} //= -t *STDOUT;  # enable on tty
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
-$opt{units}   = $opt{'human-readable'} && ['', qw( k M G T <> n μ m )];
+$opt{units}   = $opt{'human-readable'} && ['', qw( k M G T P E Z Y y z a f p n μ m )];
+$opt{anchor} //= qr/\A/;
 
 if (defined $opt{interval}) {
        $opt{interval} ||= 1;
@@ -65,13 +68,11 @@ if (defined $opt{interval}) {
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
 
 my (@lines, @values);
-my $anchor = !defined $opt{field} ? qr/\A/ :
-       $opt{field} =~ /^[0-9]+$/ ? qr/(?:\S*\h+){$opt{field}}\K/ :
-       $opt{field};
+my $valmatch = qr/$opt{anchor} ( \h* -? [0-9]* \.? [0-9]+ |)/x;
 while (readline) {
        s/\r?\n\z//;
        s/^\h*// unless $opt{unmodified};
-       push @values, s/$anchor ( \h* -? [0-9]* \.? [0-9]+ |)/\n/x && $1;
+       push @values, s/$valmatch/\n/ && $1;
        if (defined $opt{trim}) {
                my $trimpos = abs $opt{trim};
                if ($trimpos <= 1) {
@@ -125,6 +126,12 @@ if ($opt{markers} // 1 and $size > 0) {
        }
 }
 
+sub sival {
+       my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
+       sprintf "%3.1f%1s", $_[0] / 1000 ** $unit,
+               $#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit];
+}
+
 while ($nr <= $#lines) {
        $nr >= $opt{hidemax} and last if $opt{hidemax};
        my $val = $values[$nr];
@@ -133,9 +140,7 @@ while ($nr <= $#lines) {
                        $val == $order[0] ? 32 : # max
                        $val == $order[-1] ? 31 : # min
                        90;
-               $val = sprintf "%3.1f%1s", $val / 1000**$_, $opt{units}->[$_]
-                       for $opt{units} ? int(log($val) / log(1000)) : ();
-               $val = sprintf "%*s", $lenval, $val;
+               $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
                $val = "\e[${color}m$val\e[0m" if $color;
        }
        my $line = $lines[$nr] =~ s/\n/$val/r;