fix stupid unpad typo in dx command

[spider.git] / perl / DXUtil.pm

diff --git a/perl/DXUtil.pm b/perl/DXUtil.pm
index 30f12733216915cd13105b923e6528b2694150f7..b89d88ea9a89def800ffdfcba3ba39d1cc4e26aa 100644 (file)
--- a/perl/DXUtil.pm
+++ b/perl/DXUtil.pm
@@ -380,8 +380,8 @@ sub filecopy
 sub unpad
 {
        my $s = shift;
-       $s =~ s/\s+$//;
-       $s =~ s/^\s+//;
+       $s =~ s/^\s*//;
+       $s =~ s/\s*$//;
        return $s;
 }
 
@@ -578,7 +578,7 @@ sub difft
        $t -= $h * 3600;
        $m = int $t / 60;
        $out .= sprintf ("%s${m}m", $adds?' ':'') if $m;
-       if ($d == 0 && $adds || $adds == 2) {
+       if (($d == 0 && $adds) || (int $adds && $adds == 2)) {
                $s = int $t % 60;
                $out .= sprintf ("%s${s}s", $adds?' ':'') if $s;
                $out ||= sprintf ("%s0s", $adds?' ':'');