X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/b04f42d23d88fce792cc0ad8db5a0c1e35477143..62a8af47251274908bf7a65a4c261d469eff1a41:/barcat

diff --git a/barcat b/barcat
index 40f332d..aec811b 100755
--- a/barcat
+++ b/barcat
@@ -47,6 +47,7 @@ GetOptions(\%opt,
 		);
 	},
 	'markers|m=s',
+	'stat|s!',
 	'unmodified|u!',
 	'width|w=i',
 	'usage|h' => sub { podexit() },
@@ -56,7 +57,7 @@ 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 P E Z Y y z a f p n μ m )];
+$opt{units}   = [split //, ' kMGTPEZYyzafpnμm'] if $opt{'human-readable'};
 $opt{anchor} //= qr/\A/;
 $opt{'value-length'} = 6 if $opt{units};
 
@@ -95,6 +96,8 @@ sub show_lines {
 
 state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
 @lines and @lines > $nr or return;
+@lines or return;
+@lines > $nr or return unless $opt{hidemin};
 
 my @order  = sort { $b <=> $a } grep { length } @values;
 my $maxval = $opt{hidemax} ? max @values[0 .. $opt{hidemax} - 1] : $order[0];
@@ -130,19 +133,21 @@ if ($opt{markers} // 1 and $size > 0) {
 	}
 }
 
+@lines > $nr or return if $opt{hidemin};
+
 sub sival {
 	my $unit = int(log($_[0]) / log(1000) - ($_[0] < 1));
 	my $float = $_[0] !~ /^ (?: 0*\.)? [0-9]{1,3} $/x;
 	sprintf('%*.*f%*s',
 		$float ? 5 : 3, $float,  # length and tenths
 		$_[0] / 1000 ** $unit,   # number
-		$float ? 1 : 3,          # unit size
+		$float ? 0 : 3,          # unit size
 		$#{$opt{units}} >> 1 < abs $unit ? "e$unit" : $opt{units}->[$unit]
 	);
 }
 
 while ($nr <= $#lines) {
-	$nr >= $opt{hidemax} and last if $opt{hidemax};
+	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
 	if (length $val) {
 		my $color = !$opt{color} ? 0 :
@@ -163,6 +168,11 @@ while ($nr <= $#lines) {
 }
 show_lines();
 
+if ($opt{stat}) {
+	printf '%d values', scalar @values;
+	say '';
+}
+
 __END__
 
 =head1 NAME
@@ -261,6 +271,10 @@ or 68% of all entries.
 
 =back
 
+=item -s, --stat
+
+Total statistics after all data.
+
 =item -u, --unmodified
 
 Do not strip leading whitespace.