nntp: hdr_msg_id: use named sub for long_response

[public-inbox.git] / lib / PublicInbox / Spawn.pm

diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index e2868a559741b2416cdbba9960bf598434577c08..6493ad387cdbcb915ca71fcbdc325f0ce673f768 100644 (file)
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -178,7 +178,7 @@ unless (defined $vfork_spawn) {
 
 sub which ($) {
        my ($file) = @_;
-       return $file if index($file, '/') == 0;
+       return $file if index($file, '/') >= 0;
        foreach my $p (split(':', $ENV{PATH})) {
                $p .= "/$file";
                return $p if -x $p;
@@ -193,17 +193,7 @@ sub spawn ($;$$) {
        my @env;
        $opts ||= {};
 
-       my %env = $opts->{-env} ? () : %ENV;
-       if ($env) {
-               foreach my $k (keys %$env) {
-                       my $v = $env->{$k};
-                       if (defined $v) {
-                               $env{$k} = $v;
-                       } else {
-                               delete $env{$k};
-                       }
-               }
-       }
+       my %env = $env ? (%ENV, %$env) : %ENV;
        while (my ($k, $v) = each %env) {
                push @env, "$k=$v";
        }