From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] avoid IO::File for anonymous temporary files
Date: Sat, 26 Nov 2016 08:55:05 +0000 [thread overview]
Message-ID: <20161126085505.15837-1-e@80x24.org> (raw)
We do not need to import IO::File into the main programs
since Perl 5.8+ supports literal "undef" for generating
anonymous temporary file handles.
---
lib/PublicInbox/GitHTTPBackend.pm | 4 ++--
lib/PublicInbox/HTTP.pm | 8 ++++----
lib/PublicInbox/Spamcheck/Spamc.pm | 5 ++---
t/httpd-corner.t | 3 +--
4 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/GitHTTPBackend.pm b/lib/PublicInbox/GitHTTPBackend.pm
index 322005b..1987a01 100644
--- a/lib/PublicInbox/GitHTTPBackend.pm
+++ b/lib/PublicInbox/GitHTTPBackend.pm
@@ -7,7 +7,7 @@ package PublicInbox::GitHTTPBackend;
use strict;
use warnings;
use Fcntl qw(:seek);
-use IO::File;
+use IO::Handle;
use HTTP::Date qw(time2str);
use HTTP::Status qw(status_message);
use Plack::Util;
@@ -272,7 +272,7 @@ sub serve_smart {
sub input_to_file {
my ($env) = @_;
- my $in = IO::File->new_tmpfile;
+ open(my $in, '+>', undef);
unless (defined $in) {
err($env, "could not open temporary file: $!");
return;
diff --git a/lib/PublicInbox/HTTP.pm b/lib/PublicInbox/HTTP.pm
index 729d46f..cac14be 100644
--- a/lib/PublicInbox/HTTP.pm
+++ b/lib/PublicInbox/HTTP.pm
@@ -17,7 +17,7 @@ use Plack::HTTPParser qw(parse_http_request); # XS or pure Perl
use HTTP::Status qw(status_message);
use HTTP::Date qw(time2str);
use Scalar::Util qw(weaken);
-use IO::File;
+use IO::Handle;
use constant {
CHUNK_START => -1, # [a-f0-9]+\r\n
CHUNK_END => -2, # \r\n
@@ -43,7 +43,7 @@ sub process_pipelineq () {
our $MAX_REQUEST_BUFFER = $ENV{GIT_HTTP_MAX_REQUEST_BUFFER} ||
(10 * 1024 * 1024);
-my $null_io = IO::File->new('/dev/null', '<');
+open(my $null_io, '<', '/dev/null') or die "failed to open /dev/null: $!";
my $http_date;
my $prev = 0;
sub http_date () {
@@ -335,10 +335,10 @@ sub input_prepare {
quit($self, 413);
return;
}
- $input = IO::File->new_tmpfile;
+ open($input, '+>', undef);
} elsif (env_chunked($env)) {
$len = CHUNK_START;
- $input = IO::File->new_tmpfile;
+ open($input, '+>', undef);
}
# TODO: expire idle clients on ENFILE / EMFILE
diff --git a/lib/PublicInbox/Spamcheck/Spamc.pm b/lib/PublicInbox/Spamcheck/Spamc.pm
index 5190c26..30eec95 100644
--- a/lib/PublicInbox/Spamcheck/Spamc.pm
+++ b/lib/PublicInbox/Spamcheck/Spamc.pm
@@ -4,7 +4,7 @@ package PublicInbox::Spamcheck::Spamc;
use strict;
use warnings;
use PublicInbox::Spawn qw(popen_rd spawn);
-use IO::File;
+use IO::Handle;
use Fcntl qw(:DEFAULT SEEK_SET);
sub new {
@@ -72,13 +72,12 @@ sub _devnull {
sub _msg_to_fd {
my ($self, $msg, $tmpref) = @_;
- my $tmpfh;
my $fd;
if (my $ref = ref($msg)) {
my $fileno = eval { fileno($msg) };
return $fileno if defined $fileno;
- $tmpfh = IO::File->new_tmpfile;
+ open(my $tmpfh, '+>', undef) or die "failed to open: $!";
$tmpfh->autoflush(1);
$msg = \($msg->as_string) if $ref ne 'SCALAR';
print $tmpfh $$msg or die "failed to print: $!";
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 1e8465c..8a0337c 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -243,7 +243,6 @@ my $check_self = sub {
SKIP: {
use POSIX qw(dup2);
- use IO::File;
my $have_curl = 0;
foreach my $p (split(':', $ENV{PATH})) {
-x "$p/curl" or next;
@@ -255,7 +254,7 @@ SKIP: {
my $url = 'http://' . $sock->sockhost . ':' . $sock->sockport . '/sha1';
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
- my $tout = IO::File->new_tmpfile or die "new_tmpfile: $!";
+ open(my $tout, '+>', undef) or die "open temporary file: $!";
my $pid = fork;
defined $pid or die "fork: $!";
my @cmd = (qw(curl --tcp-nodelay --no-buffer -T- -HExpect: -sS), $url);
--
EW
next reply other threads:[~2016-11-26 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-26 8:55 Eric Wong [this message]
2016-12-25 9:40 ` [PATCH 2/1] http: fix clobbering of $null_io Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161126085505.15837-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).