From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 40C301F55F for ; Tue, 26 Sep 2023 10:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1695722468; bh=IT+6zJwUBn516UUuv6fH6/FI7M2+xMO+NCk97KslxWQ=; h=From:To:Subject:Date:From; b=cwuQRFLMZHLRfT308zMq2SZYb0ylIItpH/LMSTLxx0RKvw+A1JhNRjb/auYcU71HT x66Tia0hZZOcqkQx44fNFgFWDu/spEMDV17r8Q3B4RSCJPqoXKsHfFeMS40zAiZwwf wOAys5z33iCSc53DtI984DWY+RNEvYu9Znom5bVg= From: Eric Wong To: spew@80x24.org Subject: [PATCH] spawn: rely on auto-vivification for options Date: Tue, 26 Sep 2023 10:01:08 +0000 Message-ID: <20230926100108.442359-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: While we're at it, we can also avoid the fileno call since spawn() can take IO/GLOB references nowadays. --- lib/PublicInbox/Spawn.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm index 38619fc2..c18c2388 100644 --- a/lib/PublicInbox/Spawn.pm +++ b/lib/PublicInbox/Spawn.pm @@ -332,7 +332,6 @@ sub spawn ($;$$) { my ($cmd, $env, $opts) = @_; my $f = which($cmd->[0]) // die "$cmd->[0]: command not found\n"; my @env; - $opts ||= {}; my %env = (%ENV, $env ? %$env : ()); while (my ($k, $v) = each %env) { push @env, "$k=$v" if defined($v); @@ -367,8 +366,7 @@ sub spawn ($;$$) { sub popen_rd { my ($cmd, $env, $opt) = @_; pipe(my ($r, $w)) or die "pipe: $!\n"; - $opt ||= {}; - $opt->{1} = fileno($w); + local $opt->{1} = $w; my $pid = spawn($cmd, $env, $opt); return ($r, $pid) if wantarray; my $s = gensym;