From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id D3B901F9FD for ; Mon, 29 Mar 2021 07:08:25 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/3] lei_input: avoid special case sub for --stdin Date: Mon, 29 Mar 2021 07:08:23 +0000 Message-Id: <20210329070825.14798-2-e@80x24.org> In-Reply-To: <20210329070825.14798-1-e@80x24.org> References: <20210329070825.14798-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can consistently open /dev/stdin correctly nowadays, so drop the input_stdin and just use the normal ->path_to_fd code path. --- lib/PublicInbox/LeiConvert.pm | 1 - lib/PublicInbox/LeiImport.pm | 1 - lib/PublicInbox/LeiInput.pm | 8 +------- lib/PublicInbox/LeiMark.pm | 1 - 4 files changed, 1 insertion(+), 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, ''); -} - 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); }