strip trailing carriage returns

[barcat.git] / graph

diff --git a/graph b/graph
index cdcb80c90c98064ffedf65b5d6c6ae8b8d2332e8..e76ec645492b138a49ddfb11a52f1adf2e4b2088 100755 (executable)
--- a/graph
+++ b/graph
@@ -8,12 +8,16 @@ use open qw( :std :utf8 );
 our $VERSION = '1.02';
 
 use Getopt::Long '2.33', qw( :config gnu_getopt );
-sub podexit { require Pod::Usage; Pod::Usage::pod2usage(-exitval => 0, @_) }
+sub podexit {
+       require Pod::Usage;
+       Pod::Usage::pod2usage(-exitval => 0, -perldocopt => '-oman', @_);
+}
 GetOptions(\my %opt,
        'color|c!',
        'follow|f:i',
        'trim|length|l=i',
        'markers|m=s',
+       'unmodified|u!',
        'width|w=i',
        'usage|h' => sub { podexit() },
        'help'    => sub { podexit(-verbose => 2) },
@@ -35,8 +39,9 @@ $SIG{INT} = 'IGNORE';  # continue after assumed eof
 
 my (@lines, @values);
 while (readline) {
-       chomp;
-       push @values, s/^\h* ( -? [0-9]* (?:\.[0-9]+)? )//x && $1;
+       s/\r?\n\z//;
+       s/^\h*// unless $opt{unmodified};
+       push @values, s/^ ( \h* -? [0-9]* \.? [0-9]+ |)//x && $1;
        if (defined $opt{trim}) {
                my $trimpos = abs $opt{trim};
                if ($trimpos <= 1) {
@@ -180,6 +185,11 @@ or 68% of all entries.
 
 =back
 
+=item -u, --unmodified
+
+Do not strip leading whitespace.
+Keep original value alignment, which may be significant in some programs.
+
 =item -w, --width=<columns>
 
 Override the maximum number of columns to use.
@@ -214,7 +224,7 @@ Number of HTTP requests per day:
 Any kind of database query with leading counts:
 
     echo 'SELECT count(*),schemaname FROM pg_tables GROUP BY 2' |
-    psql -t | graph
+    psql -t | graph -u
 
 Git statistics, such commit count by year: