From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [SQUASH] account for /dev/* FDs in prepare_inputs, too
Date: Fri, 26 Mar 2021 23:07:11 +0000 [thread overview]
Message-ID: <YF5pH1akLER6Hfye@dcvr> (raw)
In-Reply-To: <20210326095126.8184-4-e@80x24.org>
This is needed for t/lei-import.t on FreeBSD, it should be necessary on
Linux, but I didn't notice problems there...
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index eed0eed7..d916249a 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -113,21 +113,29 @@ sub prepare_inputs { # returns undef on error
--in-format=$in_fmt and `$ifmt:' conflict
}
- if (-f $input_path) {
+ my $devfd = $lei->path_to_fd($input_path) // return;
+ if ($devfd >= 0 || (-f $input_path || -p _)) {
require PublicInbox::MboxLock;
require PublicInbox::MboxReader;
PublicInbox::MboxReader->reads($ifmt) or return
$lei->fail("$ifmt not supported");
- } elsif (-d _) {
+ } elsif (-d $input_path) {
require PublicInbox::MdirReader;
$ifmt eq 'maildir' or return
$lei->fail("$ifmt not supported");
} else {
return $lei->fail("Unable to handle $input");
}
- } elsif (-f $input) { push @f, $input }
- elsif (-d _) { push @d, $input }
- else { return $lei->fail("Unable to handle $input") }
+ } else {
+ my $devfd = $lei->path_to_fd($input) // return;
+ if ($devfd >= 0 || -f $input || -p _) {
+ push @f, $input
+ } elsif (-d $input) {
+ push @d, $input
+ } else {
+ return $lei->fail("Unable to handle $input")
+ }
+ }
}
if (@f) { check_input_format($lei, \@f) or return }
if (@d) { # TODO: check for MH vs Maildir, here
next prev parent reply other threads:[~2021-03-26 23:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-26 9:51 [PATCH 0/4] lei minor things Eric Wong
2021-03-26 9:51 ` [PATCH 1/4] lei q: skip lei/store->write_prepare for JSON outputs Eric Wong
2021-03-26 9:51 ` [PATCH 2/4] lei: do not blindly commit to lei/store on close Eric Wong
2021-03-26 9:51 ` [PATCH 3/4] lei: support /dev/fd/[0-2] inputs and outputs in daemon Eric Wong
2021-03-26 23:07 ` Eric Wong [this message]
2021-03-26 9:51 ` [PATCH 4/4] lei mark: disallow '!' in labels 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=YF5pH1akLER6Hfye@dcvr \
--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).