favor readline() and print() as functions

[public-inbox.git] / script / public-inbox-convert

diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index e13c13f44153ed1f29082a10f80317c229574422..7fb15adf69bc2e9db9b3fbf944b45052f7cfd94e 100755 (executable)
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -24,7 +24,7 @@ my $old_dir = shift(@ARGV) or die $usage;
 my $new_dir = shift(@ARGV) or die $usage;
 die "$new_dir exists\n" if -d $new_dir;
 die "$old_dir not a directory\n" unless -d $old_dir;
-my $config = eval { PublicInbox::Config->new };
+my $config = PublicInbox::Config->new;
 $old_dir = abs_path($old_dir);
 my $old;
 if ($config) {
@@ -111,12 +111,12 @@ while (<$rd>) {
                $state = 'commit';
        } elsif (/^data ([0-9]+)/) {
                my $len = $1;
-               $w->print($_) or $im->wfail;
+               print $w $_ or $im->wfail;
                while ($len) {
                        my $n = read($rd, my $tmp, $len) or die "read: $!";
                        warn "$n != $len\n" if $n != $len;
                        $len -= $n;
-                       $w->print($tmp) or $im->wfail;
+                       print $w $tmp or $im->wfail;
                }
                next;
        } elsif ($state eq 'commit') {
@@ -124,9 +124,9 @@ while (<$rd>) {
                        my ($mark, $path) = ($1, $2);
                        $D{$path} = $mark;
                        if ($last && $last ne 'm') {
-                               $w->print("D $last\n") or $im->wfail;
+                               print $w "D $last\n" or $im->wfail;
                        }
-                       $w->print("M 100644 :$mark m\n") or $im->wfail;
+                       print $w "M 100644 :$mark m\n" or $im->wfail;
                        $last = 'm';
                        next;
                }
@@ -134,15 +134,15 @@ while (<$rd>) {
                        my $mark = delete $D{$1};
                        defined $mark or die "undeleted path: $1\n";
                        if ($last && $last ne 'd') {
-                               $w->print("D $last\n") or $im->wfail;
+                               print $w "D $last\n" or $im->wfail;
                        }
-                       $w->print("M 100644 :$mark d\n") or $im->wfail;
+                       print $w "M 100644 :$mark d\n" or $im->wfail;
                        $last = 'd';
                        next;
                }
        }
        last if $_ eq "done\n";
-       $w->print($_) or $im->wfail;
+       print $w $_ or $im->wfail;
 }
 $w = $r = undef;
 close $rd or die "close fast-export: $!\n";