- my $t = ztime($_[2]);
- my $d = cldate($_[2]);
- return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+ my $t = ztime($_[3]);
+ my $d = cldate($_[3]);
+ my $spotter = "<$_[5]>";
+ my $comment = $_[4] || '';
+ $comment =~ s/\t+/ /g;
+ my $cl = length $comment;
+ my $s = sprintf "%9.1f %-11s %s %s", $_[1], $_[2], $d, $t;
+ my $width = ($_[0] ? $_[0] : 80) - length($spotter) - length($s) - 4;
+
+ $comment = substr $comment, 0, $width if $cl > $width;
+ $comment .= ' ' x ($width-$cl) if $cl < $width;
+
+# return sprintf "%8.1f %-11s %s %s %-28.28s%7s>", $_[0], $_[1], $d, $t, ($_[3]||''), "<$_[4]" ;
+ return "$s $comment$spotter";