diff -r fd87c1e3b451 -r d4942418a9ea SI/tools.pm --- a/SI/tools.pm Tue Jan 19 23:45:54 2010 +0100 +++ b/SI/tools.pm Tue Jan 19 23:48:10 2010 +0100 @@ -11,27 +11,28 @@ our @EXPORT = qw(&run &verbose &find_by_devid &cat &barf); sub run(@) { - system(@_); - die "$_[0] failed with exit code " . ($? >> 8) . "\n" - if $?; + system(@_); + die "$_[0] failed with exit code " . ($? >> 8) . "\n" + if $?; } -sub barf(@) { die Dumper @_ } +sub barf(@) { die Dumper @_ } sub cat($) { - my $fh = new IO::File $_[0] - or die "Can't open $_[0]: $!\n"; - return(<$fh>) if wantarray; + my $fh = new IO::File $_[0] + or die "Can't open $_[0]: $!\n"; + return (<$fh>) if wantarray; return join "", <$fh>; } my $last = "\n"; -sub verbose(@) { + +sub verbose(@) { print $last eq "\n" ? "" : " " - if not(@_ == 1 and length($_[0]) == 1); + if not(@_ == 1 and length($_[0]) == 1); print @_; $last = substr($_[-1], -1, 1); -}; +} sub find_by_devid($$) { my ($dir, $id) = @_; @@ -48,6 +49,6 @@ return $found[0]; } +1; -1; # vim:sts=4 sw=4 aw ai si: