about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-03-29 07:08:23 +0000
committerEric Wong <e@80x24.org>2021-03-29 13:43:53 -0400
commit64233e6d87994bdda47bfaaf154d55ad8d7802c2 (patch)
tree78a1a3c765b94cde913297e66e4777bdc6948c48 /lib
parentf844e21ecc703f7a1285ba88edee490a8e8fe462 (diff)
downloadpublic-inbox-64233e6d87994bdda47bfaaf154d55ad8d7802c2.tar.gz
We can consistently open /dev/stdin correctly nowadays, so
drop the input_stdin and just use the normal ->path_to_fd
code path.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/LeiConvert.pm1
-rw-r--r--lib/PublicInbox/LeiImport.pm1
-rw-r--r--lib/PublicInbox/LeiInput.pm8
-rw-r--r--lib/PublicInbox/LeiMark.pm1
4 files changed, 1 insertions, 10 deletions
diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm
index 5d0adb14..da3b50cc 100644
--- a/lib/PublicInbox/LeiConvert.pm
+++ b/lib/PublicInbox/LeiConvert.pm
@@ -34,7 +34,6 @@ sub input_maildir_cb {
 
 sub do_convert { # via wq_do
         my ($self) = @_;
-        $self->input_stdin;
         for my $input (@{$self->{inputs}}) {
                 $self->input_path_url($input);
         }
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 803b5cda..227a2a21 100644
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -78,7 +78,6 @@ sub lei_import { # the main "lei import" method
         $self->{-wq_nr_workers} = $j // 1; # locked
         my ($op_c, undef) = $lei->workers_start($self, 'lei_import', $j, $ops);
         $lei->{imp} = $self;
-        $self->wq_io_do('input_stdin', []) if $self->{0};
         net_merge_complete($self) unless $lei->{auth};
         $op_c->op_wait_event($ops);
 }
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index d916249a..93284e8b 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -46,12 +46,6 @@ error reading $name: $!
         }
 }
 
-sub input_stdin {
-        my ($self) = @_;
-        my $in = delete $self->{0} or return;
-        $self->input_fh($self->{lei}->{opt}->{'in-format'}, $in, '<stdin>');
-}
-
 sub input_path_url {
         my ($self, $input, @args) = @_;
         my $lei = $self->{lei};
@@ -94,7 +88,7 @@ sub prepare_inputs { # returns undef on error
                 @$inputs and return
                         $lei->fail("--stdin and @$inputs do not mix");
                 check_input_format($lei) or return;
-                $self->{0} = $lei->{0};
+                push @$inputs, '/dev/stdin';
         }
         my $net = $lei->{net}; # NetWriter may be created by l2m
         my $fmt = $lei->{opt}->{'in-format'};
diff --git a/lib/PublicInbox/LeiMark.pm b/lib/PublicInbox/LeiMark.pm
index 6e611318..b187d6e7 100644
--- a/lib/PublicInbox/LeiMark.pm
+++ b/lib/PublicInbox/LeiMark.pm
@@ -118,7 +118,6 @@ sub lei_mark { # the "lei mark" method
         $self->{vmd_mod} = $vmd_mod;
         my ($op_c, undef) = $lei->workers_start($self, 'lei_mark', 1, $ops);
         $lei->{mark} = $self;
-        $self->wq_io_do('input_stdin', []) if $self->{0};
         net_merge_complete($self) unless $lei->{auth};
         $op_c->op_wait_event($ops);
 }