lib/PublicInbox/LeiConvert.pm | 1 - lib/PublicInbox/LeiImport.pm | 1 - lib/PublicInbox/LeiInput.pm | 8 +------- lib/PublicInbox/LeiMark.pm | 1 - diff --git a/lib/PublicInbox/LeiConvert.pm b/lib/PublicInbox/LeiConvert.pm index 5d0adb14ecc5ec467c35de3c3a79d55bcdecf05b..da3b50ccfefd0a4ffbcec9307e113ddb4c4d31f2 100644 --- a/lib/PublicInbox/LeiConvert.pm +++ b/lib/PublicInbox/LeiConvert.pm @@ -34,7 +34,6 @@ } 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 803b5cdad89879d563f0e2b5d625536e67c3fbdd..227a2a2111fb38bf98819387e7b870b3e2118b7a 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -78,7 +78,6 @@ $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; $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 d916249a2e07d1f982078dc7f7af0c8bcd2159ff..93284e8b26756074194bfc6fb1fa87e261393faa 100644 --- a/lib/PublicInbox/LeiInput.pm +++ b/lib/PublicInbox/LeiInput.pm @@ -46,12 +46,6 @@ $cb->(undef, $fh, $self->can('input_mbox_cb'), $self, @args); } } -sub input_stdin { - my ($self) = @_; - my $in = delete $self->{0} or return; - $self->input_fh($self->{lei}->{opt}->{'in-format'}, $in, ''); -} - sub input_path_url { my ($self, $input, @args) = @_; my $lei = $self->{lei}; @@ -94,7 +88,7 @@ if ($lei->{opt}->{stdin}) { @$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 6e611318b3ff8510cda42329d977db28917ce6da..b187d6e76686d6b94ad0fae9dfa3ae466aa266e0 100644 --- a/lib/PublicInbox/LeiMark.pm +++ b/lib/PublicInbox/LeiMark.pm @@ -118,7 +118,6 @@ $lei->{auth}->op_merge($ops, $self) if $lei->{auth}; $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); }