syscall: SFD_NONBLOCK can be a constant, again

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

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index f960aa7289721ae51921ab3ccbf51d979975c186..03302f8af966af97087ca490eef028720027eb60 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -16,10 +16,10 @@ use POSIX ();
 use IO::Handle ();
 use Sys::Syslog qw(syslog openlog);
 use PublicInbox::Config;
-use PublicInbox::Syscall qw($SFD_NONBLOCK EPOLLIN EPOLLONESHOT);
+use PublicInbox::Syscall qw(SFD_NONBLOCK EPOLLIN EPOLLONESHOT);
 use PublicInbox::Sigfd;
-use PublicInbox::DS qw(now);
-use PublicInbox::Spawn qw(spawn);
+use PublicInbox::DS qw(now dwaitpid);
+use PublicInbox::Spawn qw(spawn run_die);
 use PublicInbox::OnDestroy;
 use Text::Wrap qw(wrap);
 use File::Path qw(mkpath);
@@ -69,7 +69,7 @@ sub _config_path ($) {
 # command => [ positional_args, 1-line description, Getopt::Long option spec ]
 our %CMD = ( # sorted in order of importance/use:
 'q' => [ 'SEARCH_TERMS...', 'search for messages matching terms', qw(
-       save-as=s output|o=s format|f=s dedupe|d=s thread|t augment|a
+       save-as=s output|mfolder|o=s format|f=s dedupe|d=s thread|t augment|a
        sort|s=s@ reverse|r offset=i remote local! external!
        since|after=s until|before=s), opt_dash('limit|n=i', '[0-9]+') ],
 
@@ -482,8 +482,7 @@ sub lei_config {
        my $cfg = _lei_cfg($self, 1);
        my $cmd = [ qw(git config -f), $cfg->{'-f'}, @argv ];
        my %rdr = map { $_ => $self->{$_} } (0..2);
-       require PublicInbox::Import;
-       PublicInbox::Import::run_die($cmd, $env, \%rdr);
+       run_die($cmd, $env, \%rdr);
 }
 
 sub lei_init {
@@ -605,7 +604,7 @@ sub lei_git { # support passing through random git commands
        my ($self, @argv) = @_;
        my %rdr = map { $_ => $self->{$_} } (0..2);
        my $pid = spawn(['git', @argv], $self->{env}, \%rdr);
-       PublicInbox::DS::dwaitpid($pid, \&reap_exec, $self);
+       dwaitpid($pid, \&reap_exec, $self);
 }
 
 sub accept_dispatch { # Listener {post_accept} callback
@@ -705,7 +704,7 @@ sub lazy_start {
                USR1 => \&noop,
                USR2 => \&noop,
        };
-       my $sigfd = PublicInbox::Sigfd->new($sig, $SFD_NONBLOCK);
+       my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK);
        local %SIG = (%SIG, %$sig) if !$sigfd;
        if ($sigfd) { # TODO: use inotify/kqueue to detect unlinked sockets
                PublicInbox::DS->SetLoopTimeout(5000);